From 688bb7094e6951dba6196280162ddc3523e88ab2 Mon Sep 17 00:00:00 2001 From: Matias Fontanini Date: Mon, 28 Mar 2016 20:31:48 -0700 Subject: [PATCH] Rename BSD enum value so it doesn't conflict with macro --- tests/active_tests/include/configuration.h | 2 +- tests/active_tests/src/configuration.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/active_tests/include/configuration.h b/tests/active_tests/include/configuration.h index deaa111..8ec9d31 100644 --- a/tests/active_tests/include/configuration.h +++ b/tests/active_tests/include/configuration.h @@ -38,7 +38,7 @@ class Configuration { public: enum Platform { WINDOWS = 1, - BSD = 2, + BSD_OS = 2, LINUX = 4 }; diff --git a/tests/active_tests/src/configuration.cpp b/tests/active_tests/src/configuration.cpp index 9fb94d9..d751051 100644 --- a/tests/active_tests/src/configuration.cpp +++ b/tests/active_tests/src/configuration.cpp @@ -41,7 +41,7 @@ Configuration::Configuration() { #ifdef _WIN32 current_platform_ = WINDOWS; #elif defined(BSD) || defined(__FreeBSD_kernel__) - current_platform_ = BSD; + current_platform_ = BSD_OS; #else current_platform_ = LINUX; #endif