blob: 6c94b42b19c7e6f7706454c9c7462e37d849b502 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57af9375..f41a8367 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -370,7 +370,7 @@ else()
# https://youtu.be/bsXLMQ6WgIk).
# By using CMAKE_CXX_STANDARD we also avoid having to implement
# compiler specific command line arguments.
- set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD 14)
# do not fall back to a previous standard
set(CMAKE_CXX_STANDARD_REQUIRED ON)
# enable compiler extensions like -std=gnu++11 on gcc
diff --git a/src/spherical_quadtree/spherical_quadtree.cc b/src/spherical_quadtree/spherical_quadtree.cc
index 6b7c08bd..c7e3f38d 100644
--- a/src/spherical_quadtree/spherical_quadtree.cc
+++ b/src/spherical_quadtree/spherical_quadtree.cc
@@ -6,21 +6,6 @@
std::mt19937 gen(0);
-#ifndef _MSC_VER
-// needed until we compile with C++14
-#if __cplusplus >= 201402L
-#error remove definition of make_unique
-#endif
-namespace std
-{
-template <typename T, typename... Args>
-std::unique_ptr<T> make_unique(Args &&... args)
-{
- return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
-}
-} // namespace std
-#endif
-
static void circumcircle(const double *v1, const double *v2, const double *v3,
double *p, double *theta)
{
|