Skip to content
Permalink
Browse files

revert 3daa57f and f51d1fb (followup ff43a5d)

  • Loading branch information
jef-n committed Oct 13, 2015
1 parent 9cd5eed commit 20217366ae81feb7512ee39aad3d356f63312953
Showing with 0 additions and 15 deletions.
  1. +0 −6 src/core/CMakeLists.txt
  2. +0 −9 src/core/geometry/qgsgeos.cpp
@@ -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}")
@@ -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, ... )
{

0 comments on commit 2021736

Please sign in to comment.
You can’t perform that action at this time.