fix multiple definition

3fdab1fe · Arnaud · 49c39a75 · 3fdab1fe · 3fdab1fe
Commit 3fdab1fe authored Jan 31, 2013 by Arnaud
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

CMakeLists.txt CMakeLists.txt +1 -1

Src/Utils/FGlobalPeriodic.hpp Src/Utils/FGlobalPeriodic.hpp +1 -1

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,7 +90,7 @@ endif()
 # Compile option
 ADD_DEFINITIONS(-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wconversion)

-CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/Src/ScalFmmConfig.h.cmake 
+CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/Src/ScalFmmConfig.h.cmake 
 		${CMAKE_BINARY_DIR}/Src/ScalFmmConfig.h  )

 # Use Mem stats

--- a/Src/Utils/FGlobalPeriodic.hpp
+++ b/Src/Utils/FGlobalPeriodic.hpp
@@ -37,7 +37,7 @@ enum PeriodicCondition {
    AllDirs     = (DirX | DirY | DirZ)
 };

-bool TestPeriodicCondition(const int conditions, const PeriodicCondition testConditions) {
+inline bool TestPeriodicCondition(const int conditions, const PeriodicCondition testConditions) {
    return (conditions & testConditions) == testConditions;
 }