diff --git a/uppsrc/Core/Diag.h b/uppsrc/Core/Diag.h index 71e151945..e7f0c78a5 100644 --- a/uppsrc/Core/Diag.h +++ b/uppsrc/Core/Diag.h @@ -167,7 +167,7 @@ struct IniBool; namespace Ini { extern IniBool user_log; -}; +} #define USRLOG(x) LOG_(Ini::user_log, x) diff --git a/uppsrc/Core/Topt.h b/uppsrc/Core/Topt.h index cce6103b9..fd9ae1bae 100644 --- a/uppsrc/Core/Topt.h +++ b/uppsrc/Core/Topt.h @@ -178,25 +178,25 @@ inline void AssertMoveable(T *t = 0) { if(t) AssertMoveable0(t); } #endif -NTL_MOVEABLE(bool); -NTL_MOVEABLE(char); -NTL_MOVEABLE(signed char); -NTL_MOVEABLE(unsigned char); -NTL_MOVEABLE(short); -NTL_MOVEABLE(unsigned short); -NTL_MOVEABLE(int); -NTL_MOVEABLE(unsigned int); -NTL_MOVEABLE(long); -NTL_MOVEABLE(unsigned long); -NTL_MOVEABLE(int64); -NTL_MOVEABLE(uint64); -NTL_MOVEABLE(float); -NTL_MOVEABLE(double); -NTL_MOVEABLE(void *); -NTL_MOVEABLE(const void *); +NTL_MOVEABLE(bool) +NTL_MOVEABLE(char) +NTL_MOVEABLE(signed char) +NTL_MOVEABLE(unsigned char) +NTL_MOVEABLE(short) +NTL_MOVEABLE(unsigned short) +NTL_MOVEABLE(int) +NTL_MOVEABLE(unsigned int) +NTL_MOVEABLE(long) +NTL_MOVEABLE(unsigned long) +NTL_MOVEABLE(int64) +NTL_MOVEABLE(uint64) +NTL_MOVEABLE(float) +NTL_MOVEABLE(double) +NTL_MOVEABLE(void *) +NTL_MOVEABLE(const void *) #if defined(_NATIVE_WCHAR_T_DEFINED) || defined(COMPILER_GCC) -NTL_MOVEABLE(wchar_t); +NTL_MOVEABLE(wchar_t) #endif template diff --git a/uppsrc/Core/XML.h b/uppsrc/Core/XML.h index c66f31a1e..f23de82b3 100644 --- a/uppsrc/Core/XML.h +++ b/uppsrc/Core/XML.h @@ -225,7 +225,7 @@ public: void Shrink(); - rval_default(XmlNode); + rval_default(XmlNode) XmlNode(const XmlNode& n, int); diff --git a/uppsrc/plugin/zstd/zstd.h b/uppsrc/plugin/zstd/zstd.h index 5cb14943f..d147decb2 100644 --- a/uppsrc/plugin/zstd/zstd.h +++ b/uppsrc/plugin/zstd/zstd.h @@ -113,6 +113,6 @@ String CoZstdDecompress(const String& s, EventGate progress = fals bool IsZstd(Stream& s); -}; +} #endif