#1605 fix nvcc compilation

DARMA-tasking · Dec 21, 2021 · ecd86ac · ecd86ac
1 parent 4899793
commit ecd86ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/cmake/load_bundled_libraries.cmake b/cmake/load_bundled_libraries.cmake
@@ -22,14 +22,6 @@ add_subdirectory(${PROJECT_LIB_DIR}/CLI)
 # fmt always included in the build
 set(FMT_LIBRARY fmt)
 add_subdirectory(${PROJECT_LIB_DIR}/fmt)
-target_compile_definitions(
-  ${FMT_LIBRARY}
-  PUBLIC
-  FMT_BEGIN_NAMESPACE=namespace\ fmt\ \{\ inline\ namespace\ vt\ \{)
-target_compile_definitions(
-  ${FMT_LIBRARY}
-  PUBLIC
-  FMT_END_NAMESPACE=\}\})
 
 # json library always included in the build
 set(JSON_BuildTests OFF)

diff --git a/lib/fmt/include/fmt/core.h b/lib/fmt/include/fmt/core.h
@@ -197,12 +197,12 @@
 #    define FMT_INLINE_NAMESPACE namespace
 #    define FMT_END_NAMESPACE \
       }                       \
-      using namespace v7;     \
+      using namespace vt;     \
       }
 #  endif
 #  define FMT_BEGIN_NAMESPACE \
     namespace fmt {           \
-    FMT_INLINE_NAMESPACE v7 {
+    FMT_INLINE_NAMESPACE vt {
 #endif
 
 #if !defined(FMT_HEADER_ONLY) && defined(_WIN32)