From b798647e0870a342b453bbf5b76fb61e7d4ff224 Mon Sep 17 00:00:00 2001
From: Phillip Stephens <antidote.crk@gmail.com>
Date: Sat, 21 Nov 2015 20:20:15 -0800
Subject: [PATCH] [atdna] Enable C++14 [Athena] Add ifndef before
 ENABLE_BITWISE_ENUM

---
 atdna/main.cpp            | 2 +-
 include/Athena/Global.hpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/atdna/main.cpp b/atdna/main.cpp
index 1073022..8e3bf12 100644
--- a/atdna/main.cpp
+++ b/atdna/main.cpp
@@ -2259,7 +2259,7 @@ int main(int argc, const char** argv)
 
     std::vector<std::string> args = {"clang-tool",
                                      "-fsyntax-only",
-                                     "-std=c++11",
+                                     "-std=c++14",
                                      "-D__atdna__=1",
                                      "-I" XSTR(INSTALL_PREFIX) "/lib/clang/" CLANG_VERSION_STRING "/include",
                                      "-I" XSTR(INSTALL_PREFIX) "/include/Athena"};
diff --git a/include/Athena/Global.hpp b/include/Athena/Global.hpp
index 322fb0f..6eaf7a7 100644
--- a/include/Athena/Global.hpp
+++ b/include/Athena/Global.hpp
@@ -69,6 +69,7 @@ typedef struct stat64 stat64_t;
 #define ROUND_UP_32(val) (((val) + 31) & ~31)
 #define ROUND_UP_16(val) (((val) + 15) & ~15)
 
+#ifndef ENABLE_BITWISE_ENUM
 #define ENABLE_BITWISE_ENUM(type)\
 inline type operator|(type a, type b)\
 {\
@@ -97,6 +98,7 @@ inline type operator~(const type& key)\
     using T = std::underlying_type_t<type>;\
     return type(~static_cast<T>(key));\
 }
+#endif
 
 namespace Athena
 {