summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/console_cmds.cpp2
-rw-r--r--src/fios.cpp2
-rw-r--r--src/misc/blob.hpp11
-rw-r--r--src/misc/countedptr.hpp12
-rw-r--r--src/misc/fixedsizearray.hpp4
-rw-r--r--src/script/squirrel_helper.hpp2
6 files changed, 17 insertions, 16 deletions
diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp
index 72df91641..e6ad350a2 100644
--- a/src/console_cmds.cpp
+++ b/src/console_cmds.cpp
@@ -808,7 +808,7 @@ DEF_CONSOLE_CMD(ConNetworkReconnect)
NetworkClientConnectGame(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port), playas);
return true;
-};
+}
DEF_CONSOLE_CMD(ConNetworkConnect)
{
diff --git a/src/fios.cpp b/src/fios.cpp
index 269b99dd2..cfaa23faf 100644
--- a/src/fios.cpp
+++ b/src/fios.cpp
@@ -68,7 +68,7 @@ void FiosFreeSavegameList()
{
_fios_items.Clear();
_fios_items.Compact();
-};
+}
/**
* Get descriptive texts. Returns the path and free space
diff --git a/src/misc/blob.hpp b/src/misc/blob.hpp
index 6c271cdcf..467261281 100644
--- a/src/misc/blob.hpp
+++ b/src/misc/blob.hpp
@@ -75,7 +75,8 @@ public:
FORCEINLINE ByteBlob() { InitEmpty(); }
/** copy constructor */
- FORCEINLINE ByteBlob(const ByteBlob &src) {
+ FORCEINLINE ByteBlob(const ByteBlob &src)
+ {
InitEmpty();
AppendRaw(src);
}
@@ -165,7 +166,7 @@ protected:
FORCEINLINE uint& LengthRef()
{
return Hdr().items;
- };
+ }
public:
/** return true if blob doesn't contain valid data */
@@ -178,13 +179,13 @@ public:
FORCEINLINE uint Length() const
{
return Hdr().items;
- };
+ }
/** return the current blob capacity in bytes */
FORCEINLINE uint Capacity() const
{
return Hdr().capacity;
- };
+ }
/** return pointer to the first byte of data - non-const version */
FORCEINLINE byte *Begin()
@@ -387,7 +388,7 @@ public:
FORCEINLINE OnTransfer Transfer()
{
return OnTransfer(*this);
- };
+ }
};
diff --git a/src/misc/countedptr.hpp b/src/misc/countedptr.hpp
index ed2afaf54..643c1b83b 100644
--- a/src/misc/countedptr.hpp
+++ b/src/misc/countedptr.hpp
@@ -34,13 +34,13 @@ protected:
public:
/** default (NULL) construct or construct from a raw pointer */
- FORCEINLINE CCountedPtr(Tcls *pObj = NULL) : m_pT(pObj) {AddRef();};
+ FORCEINLINE CCountedPtr(Tcls *pObj = NULL) : m_pT(pObj) {AddRef();}
/** copy constructor (invoked also when initializing from another smart ptr) */
- FORCEINLINE CCountedPtr(const CCountedPtr& src) : m_pT(src.m_pT) {AddRef();};
+ FORCEINLINE CCountedPtr(const CCountedPtr& src) : m_pT(src.m_pT) {AddRef();}
/** destructor releasing the reference */
- FORCEINLINE ~CCountedPtr() {Release();};
+ FORCEINLINE ~CCountedPtr() {Release();}
protected:
/** add one ref to the underlaying object */
@@ -51,10 +51,10 @@ public:
FORCEINLINE void Release() {if (m_pT != NULL) {Tcls *pT = m_pT; m_pT = NULL; pT->Release();}}
/** dereference of smart pointer - const way */
- FORCEINLINE const Tcls *operator -> () const {assert(m_pT != NULL); return m_pT;};
+ FORCEINLINE const Tcls *operator -> () const {assert(m_pT != NULL); return m_pT;}
/** dereference of smart pointer - non const way */
- FORCEINLINE Tcls *operator -> () {assert(m_pT != NULL); return m_pT;};
+ FORCEINLINE Tcls *operator -> () {assert(m_pT != NULL); return m_pT;}
/** raw pointer casting operator - const way */
FORCEINLINE operator const Tcls*() const {assert(m_pT == NULL); return m_pT;}
@@ -152,7 +152,7 @@ struct SimpleCountedObject {
{}
virtual ~SimpleCountedObject()
- {};
+ {}
virtual int32 AddRef();
virtual int32 Release();
diff --git a/src/misc/fixedsizearray.hpp b/src/misc/fixedsizearray.hpp
index fe7d6b012..5c008089c 100644
--- a/src/misc/fixedsizearray.hpp
+++ b/src/misc/fixedsizearray.hpp
@@ -91,9 +91,9 @@ public:
/** return number of used items */
FORCEINLINE uint Length() const { return Hdr().items; }
/** return true if array is full */
- FORCEINLINE bool IsFull() const { return Length() >= C; };
+ FORCEINLINE bool IsFull() const { return Length() >= C; }
/** return true if array is empty */
- FORCEINLINE bool IsEmpty() const { return Length() <= 0; };
+ FORCEINLINE bool IsEmpty() const { return Length() <= 0; }
/** add (allocate), but don't construct item */
FORCEINLINE T *Append() { assert(!IsFull()); return &data[SizeRef()++]; }
/** add and construct item using default constructor */
diff --git a/src/script/squirrel_helper.hpp b/src/script/squirrel_helper.hpp
index 67f8a21ce..c1ecc64ad 100644
--- a/src/script/squirrel_helper.hpp
+++ b/src/script/squirrel_helper.hpp
@@ -883,6 +883,6 @@ namespace SQConvert {
}
}
-}; // namespace SQConvert
+} // namespace SQConvert
#endif /* SQUIRREL_HELPER_HPP */