revert 3daa57f and f51d1fb (followup ff43a5d)

qgis · Oct 13, 2015 · 20217366ae81feb7512ee39aad3d356f63312953 · 2021736
1 parent 9cd5eed
commit 20217366ae81feb7512ee39aad3d356f63312953
Unified Split

Showing with 0 additions and 15 deletions.

+0 −6 src/core/CMakeLists.txt

+0 −9 src/core/geometry/qgsgeos.cpp
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -327,12 +327,6 @@ SET(QGIS_CORE_SRCS
   geometry/qgswkbtypes.cpp
 )
 
-INCLUDE(CheckCXXSourceCompiles)
-CHECK_CXX_SOURCE_COMPILES("#include <cmath>\nint main() { double d = std::round (0.3); return 0; }\n" HAVE_STD_ROUND)
-IF(HAVE_STD_ROUND)
-  ADD_DEFINITIONS(-DHAVE_STD_ROUND)
-ENDIF(HAVE_STD_ROUND)
-
 FILE(GLOB JSON_HELP_FILES "${CMAKE_SOURCE_DIR}/resources/function_help/json/*")
 STRING(REPLACE "$" "$$" JSON_HELP_FILES "${JSON_HELP_FILES}")
 STRING(REPLACE "\(" "\\(" JSON_HELP_FILES "${JSON_HELP_FILES}")

diff --git a/src/core/geometry/qgsgeos.cpp b/src/core/geometry/qgsgeos.cpp
@@ -49,15 +49,6 @@ email                : marco.hugentobler at sourcepole dot com
     return r; \
   }
 
-#ifndef HAVE_STD_ROUND
-namespace std
-{
-  double round( double d )
-  {
-    return d < 0.0 ? ceil( d - 0.5 ) : floor( d + 0.5 );
-  }
-}
-#endif
 
 static void throwGEOSException( const char *fmt, ... )
 {