Fix merge conflict with Amit's Branch

openkim · Feb 2, 2025 · 2e1a87e · 2e1a87e
1 parent 1ddb0ed
commit 2e1a87e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -50,9 +50,6 @@ endif()
 
 message(STATUS "KIM-API Build Type: ${CMAKE_BUILD_TYPE}")
 
-# C++ Language Standard, enforced to be C++11
-# set(CMAKE_CXX_STANDARD 11)
-
 set_cache_with_fallback(KIM_API_LOG_MAXIMUM_LEVEL "${_LOG_MAX}" STRING "Maximum log verbosity")
 unset(_LOG_MAX)
 set_property(CACHE KIM_API_LOG_MAXIMUM_LEVEL PROPERTY STRINGS "" SILENT FATAL ERROR WARNING INFORMATION DEBUG)

diff --git a/cpp/src/KIM_SharedLibrary.cpp b/cpp/src/KIM_SharedLibrary.cpp
@@ -55,10 +55,6 @@
 #include "KIM_SharedLibrarySchema.hpp"
 #endif
 
-#ifndef BASE64_HPP
-#include "base64-encode/base64.hpp"  // For base64 decoding
-#endif
-
 namespace
 {
 static void * const referencePointForKIM_Library = NULL;