Extract dummyShouldNotBeCalled function and hic namespace macro.

hic/src/CMakeLists.txt

@@ -30,6 +30,8 @@ ecbuild_add_library( TARGET hic
 install( FILES ${PROJECT_BINARY_DIR}/src/hic/hic_config.h DESTINATION include/hic )
 install( FILES hic/hic.h                                  DESTINATION include/hic )
 install( FILES hic/hic_runtime.h                          DESTINATION include/hic )
+install( FILES hic/hic_namespace_macro.h                  DESTINATION include/hic )
+install( FILES hic/hic_dummy/dummyShouldNotBeCalled.h     DESTINATION include/hic/hic_dummy )
 install( FILES hic/hic_dummy/hic_dummy_runtime.h          DESTINATION include/hic/hic_dummy )
 
 if( HAVE_CUDA )

hic/src/hic/hic_dummy/dummyShouldNotBeCalled.h

@@ -0,0 +1,21 @@
+/*
+ * (C) Copyright 2024- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ * In applying this licence, ECMWF does not waive the privileges and immunities
+ * granted to it by virtue of its status as an intergovernmental organisation
+ * nor does it submit to any jurisdiction.
+ */
+#pragma once
+
+#include <stdexcept>
+#include <string>
+
+namespace {
+
+[[noreturn]] void dummyShouldNotBeCalled(const char* symbol) {
+    throw std::runtime_error(std::string(symbol)+" is using the dummy backend and should not be called");
+}
+
+}

hic/src/hic/hic_dummy/hic_dummy_runtime.h

@@ -8,8 +8,7 @@
  * nor does it submit to any jurisdiction.
  */
 
-#include <stdexcept>
-#include <string>
+#include "hic/hic_dummy/dummyShouldNotBeCalled.h"
 
 #define DUMMY_SHOULD_NOT_BE_CALLED(SYMBOL) dummyShouldNotBeCalled( #SYMBOL )
 #define DUMMY_FUNCTION(SYMBOL) \
@@ -23,10 +22,6 @@
 
 namespace {
 
-[[noreturn]] void dummyShouldNotBeCalled(const char* symbol) {
-    throw std::runtime_error(std::string(symbol)+" is using the dummy backend and should not be called");
-}
-
 using dummyError_t  = int;
 using dummyEvent_t  = void*;
 using dummyStream_t = void*;

hic/src/hic/hic_namespace_macro.h

@@ -0,0 +1,19 @@
+/*
+ * (C) Copyright 2024- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ * In applying this licence, ECMWF does not waive the privileges and immunities
+ * granted to it by virtue of its status as an intergovernmental organisation
+ * nor does it submit to any jurisdiction.
+ */
+#pragma once
+
+#if !defined(HIC_NAMESPACE)
+  #define HIC_NAMESPACE
+  #define HIC_NAMESPACE_BEGIN
+  #define HIC_NAMESPACE_END
+#else
+  #define HIC_NAMESPACE_BEGIN namespace HIC_NAMESPACE {
+  #define HIC_NAMESPACE_END }
+#endif

hic/src/hic/hic_runtime.h

@@ -9,14 +9,7 @@
  */
 #pragma once
 
-#if !defined(HIC_NAMESPACE)
-  #define HIC_NAMESPACE
-  #define HIC_NAMESPACE_BEGIN
-  #define HIC_NAMESPACE_END
-#else
-  #define HIC_NAMESPACE_BEGIN namespace HIC_NAMESPACE {
-  #define HIC_NAMESPACE_END }
-#endif
+#include "hic/hic_namespace_macro.h"
 
 #if HIC_BACKEND_CUDA
   #define HIC_BACKEND cuda