Update to 1.11.0-beta1

src/misc/CMakeLists.txt

@@ -0,0 +1,14 @@
+add_files(
+    array.hpp
+    binaryheap.hpp
+    blob.hpp
+    countedobj.cpp
+    countedptr.hpp
+    dbg_helpers.cpp
+    dbg_helpers.h
+    fixedsizearray.hpp
+    getoptdata.cpp
+    getoptdata.h
+    hashtable.hpp
+    str.hpp
+)

src/misc/binaryheap.hpp

@@ -17,10 +17,10 @@
 
 #if BINARYHEAP_CHECK
 	/** Check for consistency. */
-	#define CHECK_CONSISTY() this->CheckConsistency()
+#	define CHECK_CONSISTY() this->CheckConsistency()
 #else
 	/** Don't check for consistency. */
-	#define CHECK_CONSISTY() ;
+#	define CHECK_CONSISTY() ;
 #endif
 
 /**

src/misc/fixedsizearray.hpp

@@ -67,7 +67,7 @@ public:
 	FixedSizeArray()
 	{
 		/* Ensure the size won't overflow. */
-		assert_compile(C < (SIZE_MAX - HeaderSize) / Tsize);
+		static_assert(C < (SIZE_MAX - HeaderSize) / Tsize);
 
 		/* allocate block for header + items (don't construct items) */
 		data = (T*)((MallocT<byte>(HeaderSize + C * Tsize)) + HeaderSize);

src/misc/str.hpp

@@ -90,9 +90,9 @@ struct CStrA : public CBlobT<char>
 	}
 
 	/** Add formatted string (like vsprintf) at the end of existing contents. */
-	int AddFormatL(const char *format, va_list args)
+	int AddFormatL(const char *format, va_list args) WARN_FORMAT(2, 0)
 	{
-		size_t addSize = max<size_t>(strlen(format), 16);
+		size_t addSize = std::max<size_t>(strlen(format), 16);
 		addSize += addSize / 2;
 		int ret;
 		int err = 0;