aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRian Quinn <rianquinn@gmail.com>2016-09-28 09:53:33 -0600
committerGitHub <noreply@github.com>2016-09-28 09:53:33 -0600
commit3161d6133fb0c05785e657acd4b178d0253e8319 (patch)
treeca5a0e75d801e54182ecf8c3eef169201fbb7eb2
parent4b29878d702e4cd243d5bf6f0eb5dcb228301be4 (diff)
downloadplatform_external_Microsoft-GSL-3161d6133fb0c05785e657acd4b178d0253e8319.tar.gz
platform_external_Microsoft-GSL-3161d6133fb0c05785e657acd4b178d0253e8319.tar.bz2
platform_external_Microsoft-GSL-3161d6133fb0c05785e657acd4b178d0253e8319.zip
Fix issue with VS builds
The Visual Studio part of this patch was wrong, and left an empty if statement.
-rw-r--r--gsl/gsl_assert8
1 files changed, 4 insertions, 4 deletions
diff --git a/gsl/gsl_assert b/gsl/gsl_assert
index 34b3ecb..6d8760d 100644
--- a/gsl/gsl_assert
+++ b/gsl/gsl_assert
@@ -39,11 +39,11 @@
#define GSL_STRINGIFY(x) GSL_STRINGIFY_DETAIL(x)
#if defined(__clang__) || defined(__GNUC__)
-#define GSL_LIKELY(x) __builtin_expect (!!(x), 1)
-#define GSL_UNLIKELY(x) __builtin_expect (!!(x), 0)
+#define GSL_LIKELY(x) __builtin_expect (!!(x), 1)
+#define GSL_UNLIKELY(x) __builtin_expect (!!(x), 0)
#else
-#define GSL_LIKELY(x)
-#define GSL_UNLIKELY(x)
+#define GSL_LIKELY(x) (x)
+#define GSL_UNLIKELY(x) (x)
#endif
//