diff options
Diffstat (limited to 'Tools/GrownBiomeGenVisualiser/Globals.h')
| -rw-r--r-- | Tools/GrownBiomeGenVisualiser/Globals.h | 119 |
1 files changed, 58 insertions, 61 deletions
diff --git a/Tools/GrownBiomeGenVisualiser/Globals.h b/Tools/GrownBiomeGenVisualiser/Globals.h index 2c5d090f5..cdaecdba3 100644 --- a/Tools/GrownBiomeGenVisualiser/Globals.h +++ b/Tools/GrownBiomeGenVisualiser/Globals.h @@ -10,20 +10,20 @@ // Compiler-dependent stuff: #if defined(_MSC_VER) - // MSVC produces warning C4481 on the override keyword usage, so disable the warning altogether - #pragma warning(disable:4481) +// MSVC produces warning C4481 on the override keyword usage, so disable the warning altogether +#pragma warning(disable : 4481) - // Disable some warnings that we don't care about: - #pragma warning(disable:4100) +// Disable some warnings that we don't care about: +#pragma warning(disable : 4100) #elif defined(__GNUC__) - // TODO: Can GCC explicitly mark classes as abstract (no instances can be created)? - #define abstract +// TODO: Can GCC explicitly mark classes as abstract (no instances can be created)? +#define abstract #else - #error "You are using an unsupported compiler, you might need to #define some stuff here for your compiler" +#error "You are using an unsupported compiler, you might need to #define some stuff here for your compiler" #endif @@ -32,7 +32,7 @@ #ifndef TOLUA_TEMPLATE_BIND - #define TOLUA_TEMPLATE_BIND(x) +#define TOLUA_TEMPLATE_BIND(x) #endif @@ -41,12 +41,12 @@ // Integral types with predefined sizes: typedef long long Int64; -typedef int Int32; -typedef short Int16; +typedef int Int32; +typedef short Int16; typedef unsigned long long UInt64; -typedef unsigned int UInt32; -typedef unsigned short UInt16; +typedef unsigned int UInt32; +typedef unsigned short UInt16; typedef unsigned char Byte; @@ -57,57 +57,57 @@ typedef unsigned char Byte; // A macro to disallow the copy constructor and operator= functions // This should be used in the private: declarations for any class that shouldn't allow copying itself #define DISALLOW_COPY_AND_ASSIGN(TypeName) \ - TypeName(const TypeName &); \ + TypeName(const TypeName &); \ void operator=(const TypeName &) // A macro that is used to mark unused function parameters, to avoid pedantic warnings in gcc -#define UNUSED(X) (void)(X) +#define UNUSED(X) (void) (X) // OS-dependent stuff: #ifdef _WIN32 - #define WIN32_LEAN_AND_MEAN - #include <Windows.h> - #include <winsock2.h> - #include <ws2tcpip.h> +#define WIN32_LEAN_AND_MEAN +#include <Windows.h> +#include <winsock2.h> +#include <ws2tcpip.h> - // Windows SDK defines min and max macros, messing up with our std::min and std::max usage - #undef min - #undef max +// Windows SDK defines min and max macros, messing up with our std::min and std::max usage +#undef min +#undef max - // Windows SDK defines GetFreeSpace as a constant, probably a Win16 API remnant - #ifdef GetFreeSpace - #undef GetFreeSpace - #endif // GetFreeSpace +// Windows SDK defines GetFreeSpace as a constant, probably a Win16 API remnant +#ifdef GetFreeSpace +#undef GetFreeSpace +#endif // GetFreeSpace - #define SocketError WSAGetLastError() +#define SocketError WSAGetLastError() #else - #include <sys/types.h> - #include <sys/stat.h> // for mkdir - #include <sys/time.h> - #include <sys/socket.h> - #include <netinet/in.h> - #include <arpa/inet.h> - #include <netdb.h> - #include <dirent.h> - #include <iostream> - #include <unistd.h> - - #include <cstring> - #include <pthread.h> - #include <semaphore.h> - #include <cerrno> - #include <fcntl.h> - - typedef int SOCKET; - enum - { - INVALID_SOCKET = -1, - }; - #define closesocket close - #define SocketError errno +#include <sys/types.h> +#include <sys/stat.h> // for mkdir +#include <sys/time.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <arpa/inet.h> +#include <netdb.h> +#include <dirent.h> +#include <iostream> +#include <unistd.h> + +#include <cstring> +#include <pthread.h> +#include <semaphore.h> +#include <cerrno> +#include <fcntl.h> + +typedef int SOCKET; +enum +{ + INVALID_SOCKET = -1, +}; +#define closesocket close +#define SocketError errno #endif @@ -156,17 +156,17 @@ typedef unsigned char Byte; #define ARRAYCOUNT(X) (sizeof(X) / sizeof(*(X))) /** Allows arithmetic expressions like "32 KiB" (but consider using parenthesis around it, "(32 KiB)") */ -#define KiB * 1024 -#define MiB * 1024 * 1024 +#define KiB *1024 +#define MiB *1024 * 1024 /** Faster than (int)floorf((float)x / (float)div) */ -#define FAST_FLOOR_DIV(x, div) ((x) < 0 ? (((int)x / div) - 1) : ((int)x / div)) +#define FAST_FLOOR_DIV(x, div) ((x) < 0 ? (((int) x / div) - 1) : ((int) x / div)) /** Own version of assert() that writes failed assertions to the log for review */ -#ifdef NDEBUG - #define ASSERT(x) ((void)0) +#ifdef NDEBUG +#define ASSERT(x) ((void) 0) #else - #define ASSERT assert +#define ASSERT assert #endif // Pretty much the same as ASSERT() but stays in Release builds @@ -177,16 +177,13 @@ typedef unsigned char Byte; /** Clamp X to the specified range. */ -template <typename T> -T Clamp(T a_Value, T a_Min, T a_Max) +template <typename T> T Clamp(T a_Value, T a_Min, T a_Max) { return (a_Value < a_Min) ? a_Min : ((a_Value > a_Max) ? a_Max : a_Value); } -template <typename T> -auto ToUnsigned(T a_Val) +template <typename T> auto ToUnsigned(T a_Val) { ASSERT(a_Val >= 0); return static_cast<std::make_unsigned_t<T>>(a_Val); } - |