Skip to content

Commit 2021736

Browse files
committed
revert 3daa57f and f51d1fb (followup ff43a5d)
1 parent 9cd5eed commit 2021736

File tree

2 files changed

+0
-15
lines changed

2 files changed

+0
-15
lines changed

src/core/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -327,12 +327,6 @@ SET(QGIS_CORE_SRCS
327327
geometry/qgswkbtypes.cpp
328328
)
329329

330-
INCLUDE(CheckCXXSourceCompiles)
331-
CHECK_CXX_SOURCE_COMPILES("#include <cmath>\nint main() { double d = std::round (0.3); return 0; }\n" HAVE_STD_ROUND)
332-
IF(HAVE_STD_ROUND)
333-
ADD_DEFINITIONS(-DHAVE_STD_ROUND)
334-
ENDIF(HAVE_STD_ROUND)
335-
336330
FILE(GLOB JSON_HELP_FILES "${CMAKE_SOURCE_DIR}/resources/function_help/json/*")
337331
STRING(REPLACE "$" "$$" JSON_HELP_FILES "${JSON_HELP_FILES}")
338332
STRING(REPLACE "\(" "\\(" JSON_HELP_FILES "${JSON_HELP_FILES}")

src/core/geometry/qgsgeos.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,6 @@ email : marco.hugentobler at sourcepole dot com
4949
return r; \
5050
}
5151

52-
#ifndef HAVE_STD_ROUND
53-
namespace std
54-
{
55-
double round( double d )
56-
{
57-
return d < 0.0 ? ceil( d - 0.5 ) : floor( d + 0.5 );
58-
}
59-
}
60-
#endif
6152

6253
static void throwGEOSException( const char *fmt, ... )
6354
{

0 commit comments

Comments
 (0)