Mercurial > hg > openttd
changeset 14912:ec975dc25575 draft
(svn r19509) -Codechange: remove superfluous semicolons after function definitions
| author | smatz <smatz@openttd.org> |
|---|---|
| date | Tue, 23 Mar 2010 22:37:18 +0000 |
| parents | 6f4b2a7f8916 |
| children | af037448df6e |
| files | src/console_cmds.cpp src/fios.cpp src/misc/blob.hpp src/misc/countedptr.hpp src/misc/fixedsizearray.hpp src/script/squirrel_helper.hpp |
| diffstat | 6 files changed, 17 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/console_cmds.cpp +++ b/src/console_cmds.cpp @@ -808,7 +808,7 @@ NetworkClientConnectGame(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port), playas); return true; -}; +} DEF_CONSOLE_CMD(ConNetworkConnect) {
--- a/src/fios.cpp +++ b/src/fios.cpp @@ -68,7 +68,7 @@ { _fios_items.Clear(); _fios_items.Compact(); -}; +} /** * Get descriptive texts. Returns the path and free space
--- a/src/misc/blob.hpp +++ b/src/misc/blob.hpp @@ -75,7 +75,8 @@ FORCEINLINE ByteBlob() { InitEmpty(); } /** copy constructor */ - FORCEINLINE ByteBlob(const ByteBlob &src) { + FORCEINLINE ByteBlob(const ByteBlob &src) + { InitEmpty(); AppendRaw(src); } @@ -165,7 +166,7 @@ FORCEINLINE uint& LengthRef() { return Hdr().items; - }; + } public: /** return true if blob doesn't contain valid data */ @@ -178,13 +179,13 @@ 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 @@ FORCEINLINE OnTransfer Transfer() { return OnTransfer(*this); - }; + } };
--- a/src/misc/countedptr.hpp +++ b/src/misc/countedptr.hpp @@ -34,13 +34,13 @@ 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 @@ 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 @@ {} virtual ~SimpleCountedObject() - {}; + {} virtual int32 AddRef(); virtual int32 Release();
--- a/src/misc/fixedsizearray.hpp +++ b/src/misc/fixedsizearray.hpp @@ -91,9 +91,9 @@ /** 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 */