|
|
@@ -4,23 +4,30 @@
|
|
|
// Standard defines documented here: http://predef.sourceforge.net
|
|
|
|
|
|
#if defined(_MSC_VER)
|
|
|
- #pragma warning(disable:4127) // conditional expression is constant
|
|
|
- #pragma warning(disable:4702) // unreachable code
|
|
|
- #pragma warning(disable:4722) // destructor never returns, potential memory leak
|
|
|
-
|
|
|
- #if (_MSC_VER == 1200) // VC6
|
|
|
- #pragma warning(disable:4786)
|
|
|
- #pragma warning(disable:4290)
|
|
|
- #endif
|
|
|
+# pragma warning(disable:4127) // conditional expression is constant
|
|
|
+# pragma warning(disable:4702) // unreachable code
|
|
|
+# pragma warning(disable:4722) // destructor never returns, potential memory leak
|
|
|
+
|
|
|
+# if (_MSC_VER == 1200) // VC6
|
|
|
+# pragma warning(disable:4786)
|
|
|
+# pragma warning(disable:4290)
|
|
|
+# endif
|
|
|
#endif
|
|
|
|
|
|
-#if defined(unix) || defined(__unix__) || defined(__unix) || defined(linux) || \
|
|
|
- defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
|
|
|
- #define UNITTEST_POSIX
|
|
|
+#if defined(unix) \
|
|
|
+ || defined(__unix__) \
|
|
|
+ || defined(__unix) \
|
|
|
+ || defined(linux) \
|
|
|
+ || defined(__APPLE__) \
|
|
|
+ || defined(__NetBSD__) \
|
|
|
+ || defined(__OpenBSD__) \
|
|
|
+ || defined(__FreeBSD__) \
|
|
|
+ || defined(__native_client__)
|
|
|
+# define UNITTEST_POSIX
|
|
|
#endif
|
|
|
|
|
|
#if defined(__MINGW32__)
|
|
|
- #define UNITTEST_MINGW
|
|
|
+# define UNITTEST_MINGW
|
|
|
#endif
|
|
|
|
|
|
// by default, MemoryOutStream is implemented in terms of std::ostringstream, which can be expensive.
|