summaryrefslogtreecommitdiffstats
path: root/Tools/NoiseSpeedTest/Globals.h
diff options
context:
space:
mode:
authorpeterbell10 <peterbell10@live.co.uk>2017-10-21 15:29:20 +0200
committerMattes D <github@xoft.cz>2017-10-21 19:31:45 +0200
commit5b6b04375270f3f3ba90780ecf692d56af157e49 (patch)
tree9006e2704a5eefe3685f8dcd5ddde44b24d8d329 /Tools/NoiseSpeedTest/Globals.h
parentTravisCI: Add osx builds (diff)
downloadcuberite-5b6b04375270f3f3ba90780ecf692d56af157e49.tar
cuberite-5b6b04375270f3f3ba90780ecf692d56af157e49.tar.gz
cuberite-5b6b04375270f3f3ba90780ecf692d56af157e49.tar.bz2
cuberite-5b6b04375270f3f3ba90780ecf692d56af157e49.tar.lz
cuberite-5b6b04375270f3f3ba90780ecf692d56af157e49.tar.xz
cuberite-5b6b04375270f3f3ba90780ecf692d56af157e49.tar.zst
cuberite-5b6b04375270f3f3ba90780ecf692d56af157e49.zip
Diffstat (limited to 'Tools/NoiseSpeedTest/Globals.h')
-rw-r--r--Tools/NoiseSpeedTest/Globals.h66
1 files changed, 30 insertions, 36 deletions
diff --git a/Tools/NoiseSpeedTest/Globals.h b/Tools/NoiseSpeedTest/Globals.h
index e62d2b432..f332942ae 100644
--- a/Tools/NoiseSpeedTest/Globals.h
+++ b/Tools/NoiseSpeedTest/Globals.h
@@ -12,30 +12,30 @@
#if defined(_MSC_VER)
// 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)
#define OBSOLETE __declspec(deprecated)
-
+
// No alignment needed in MSVC
#define ALIGN_8
#define ALIGN_16
-
+
#define FORMATSTRING(formatIndex, va_argsIndex)
// MSVC has its own custom version of zu format
#define SIZE_T_FMT "%Iu"
#define SIZE_T_FMT_PRECISION(x) "%" #x "Iu"
#define SIZE_T_FMT_HEX "%Ix"
-
+
#define NORETURN __declspec(noreturn)
#elif defined(__GNUC__)
// TODO: Can GCC explicitly mark classes as abstract (no instances can be created)?
#define abstract
-
+
#define OBSOLETE __attribute__((deprecated))
#define ALIGN_8 __attribute__((aligned(8)))
@@ -43,24 +43,24 @@
// Some portability macros :)
#define stricmp strcasecmp
-
- #define FORMATSTRING(formatIndex,va_argsIndex)
+
+ #define FORMATSTRING(formatIndex, va_argsIndex)
#define SIZE_T_FMT "%zu"
#define SIZE_T_FMT_PRECISION(x) "%" #x "zu"
#define SIZE_T_FMT_HEX "%zx"
-
+
#define NORETURN __attribute((__noreturn__))
#else
#error "You are using an unsupported compiler, you might need to #define some stuff here for your compiler"
-
+
/*
// Copy and uncomment this into another #elif section based on your compiler identification
-
+
// Explicitly mark classes as abstract (no instances can be created)
#define abstract
-
+
// Mark functions as obsolete, so that their usage results in a compile-time warning
#define OBSOLETE
@@ -68,8 +68,8 @@
#define ALIGN_8
#define ALIGN_16
*/
-
- #define FORMATSTRING(formatIndex,va_argsIndex) __attribute__((format (printf, formatIndex, va_argsIndex)))
+
+ #define FORMATSTRING(formatIndex, va_argsIndex) __attribute__((format (printf, formatIndex, va_argsIndex)))
#endif
@@ -110,16 +110,16 @@ typedef unsigned char Byte;
#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 GetFreeSpace as a constant, probably a Win16 API remnant
#ifdef GetFreeSpace
#undef GetFreeSpace
#endif // GetFreeSpace
-
+
#define SocketError WSAGetLastError()
#else
#include <sys/types.h>
@@ -129,19 +129,16 @@ typedef unsigned char Byte;
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
- #include <time.h>
#include <dirent.h>
- #include <errno.h>
#include <iostream>
#include <unistd.h>
- #include <cstdio>
#include <cstring>
#include <pthread.h>
#include <semaphore.h>
- #include <errno.h>
+ #include <cerrno>
#include <fcntl.h>
-
+
typedef int SOCKET;
enum
{
@@ -149,9 +146,6 @@ typedef unsigned char Byte;
};
#define closesocket close
#define SocketError errno
-#if !defined(ANDROID_NDK)
- #include <tr1/memory>
-#endif
#endif
#if !defined(ANDROID_NDK)
@@ -169,11 +163,11 @@ typedef unsigned char Byte;
// CRT stuff:
-#include <assert.h>
-#include <stdio.h>
-#include <math.h>
-#include <stdarg.h>
-#include <time.h>
+#include <cassert>
+#include <cstdio>
+#include <cmath>
+#include <cstdarg>
+#include <ctime>
@@ -209,15 +203,15 @@ typedef unsigned char Byte;
// Common definitions:
-/// Evaluates to the number of elements in an array (compile-time!)
+/** Evaluates to the number of elements in an array (compile-time!) */
#define ARRAYCOUNT(X) (sizeof(X) / sizeof(*(X)))
-/// Allows arithmetic expressions like "32 KiB" (but consider using parenthesis around it, "(32 KiB)" )
+/** Allows arithmetic expressions like "32 KiB" (but consider using parenthesis around it, "(32 KiB)") */
#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) )
+/** Faster than (int)floorf((float)x / (float)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
@@ -227,17 +221,17 @@ typedef unsigned char Byte;
#endif
// Pretty much the same as ASSERT() but stays in Release builds
-#define VERIFY( x ) ( !!(x) || ( LOGERROR("Verification failed: %s, file %s, line %i", #x, __FILE__, __LINE__ ), exit(1), 0 ) )
+#define VERIFY(x) (!!(x) || (LOGERROR("Verification failed: %s, file %s, line %i", #x, __FILE__, __LINE__), exit(1), 0))
-/// A generic interface used mainly in ForEach() functions
+/** A generic interface used mainly in ForEach() functions */
template <typename Type> class cItemCallback
{
public:
- /// Called for each item in the internal list; return true to stop the loop, or false to continue enumerating
+ /** Called for each item in the internal list; return true to stop the loop, or false to continue enumerating */
virtual bool Item(Type * a_Type) = 0;
virtual ~cItemCallback() {}
} ;