added CATCH2 fast compile and fixed #def to prefix with HERMES_

HDFGroup · Jan 14, 2021 · 8d7212b · 8d7212b
1 parent 0963cd8
commit 8d7212b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -125,7 +125,7 @@ endif()
 
 if(NOT CMAKE_CXX_FLAGS)
 #TODO: add -Werror
- set (CMAKE_CXX_FLAGS "-Wall -Wextra ${CMAKE_CXX_FLAGS}")
+ set (CMAKE_CXX_FLAGS "-Wall -Wextra ${CMAKE_CXX_FLAGS} -DCATCH_CONFIG_FAST_COMPILE")
  message (STATUS "Warnings Configuration: default: ${CMAKE_CXX_FLAGS}")
 endif()
 

diff --git a/src/api/traits.cc b/src/api/traits.cc
@@ -16,7 +16,7 @@ Trait::Trait(TraitID id, TraitIdArray conflict_traits, TraitType type)
 FileMappingTrait::FileMappingTrait(
     std::string &filename, std::unordered_map<std::string, u64> &offset_map,
     TraitCallback flush_cb, TraitCallback load_cb)
-    : Trait(FILE_TRAIT, TraitIdArray(), TraitType::FILE_MAPPING),
+    : Trait(HERMES_FILE_TRAIT, TraitIdArray(), TraitType::FILE_MAPPING),
       flush_cb(flush_cb),
       load_cb(load_cb),
       filename(filename),

diff --git a/src/api/traits.h b/src/api/traits.h
@@ -28,7 +28,7 @@ struct Trait {
   Trait(TraitID id, TraitIdArray conflict_traits, TraitType type);
 };
 
-#define FILE_TRAIT 10
+#define HERMES_FILE_TRAIT 10
 
 struct FileMappingTrait : public Trait {
  public: