Updating naming so it doesn't clash

meelgroup · Oct 14, 2023 · 1efa448 · 1efa448
1 parent 6ee2c0d
commit 1efa448
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 9 deletions.
diff --git a/setup.py b/setup.py
@@ -61,7 +61,7 @@ def gen_modules(version):
                    "python/src/GitSHA1.cpp",
                    "python/src/pyapproxmc.cpp",
                    "src/approxmc.cpp",
-                   "src/constants.cpp",
+                   "src/appmc_constants.cpp",
                    "src/counter.cpp",
                    "python/cryptominisat/python/src/GitSHA1.cpp",
                    "python/cryptominisat/src/bva.cpp",

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -64,7 +64,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/GitSHA1.cpp.in" "${CMAKE_CURRENT_BIN
 set(approxmc_lib_files
     approxmc.cpp
     counter.cpp
-    constants.cpp
+    appmc_constants.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp
 )
 

diff --git a/src/constants.cpp → src/appmc_constants.cpp b/src/constants.cpp → src/appmc_constants.cpp
@@ -27,7 +27,7 @@
  THE SOFTWARE.
  */
 
-#include "constants.h"
+#include "appmc_constants.h"
 #include <iostream>
 #include <sstream>
 #include <cassert>

diff --git a/src/constants.h → src/appmc_constants.h b/src/constants.h → src/appmc_constants.h
@@ -26,8 +26,7 @@
  THE SOFTWARE.
  */
 
-#ifndef CONSTANTS_H__
-#define CONSTANTS_H__
+#pragma once
 
 #include <cstdint>
 #include <vector>
@@ -64,5 +63,3 @@ class Constants
 };
 
 }
-
-#endif
diff --git a/src/approxmc.cpp b/src/approxmc.cpp
@@ -28,7 +28,7 @@
 
 #include "approxmc.h"
 #include "counter.h"
-#include "constants.h"
+#include "appmc_constants.h"
 #include "config.h"
 #include <iostream>
 

diff --git a/src/counter.h b/src/counter.h
@@ -38,7 +38,7 @@
 #include <cstdint>
 #include <mutex>
 #include "approxmc.h"
-#include "constants.h"
+#include "appmc_constants.h"
 
 using std::string;
 using std::vector;