cleanup: Drop compat bits for not-quite-C++14 compilers

Author: robinlinden

BUILD.bazel

@@ -52,9 +52,6 @@ cc_binary(
         ":lib/src/jvmMain/cpp/jni.h",
         ":lib/src/jvmMain/cpp/jni_md.h",
     ],
-    copts = [
-        "-DHAVE_TO_STRING",
-    ],
     includes = [
         "lib/src/jvmMain/cpp",
         "lib/src/jvmMain/proto",

lib/src/jvmMain/cpp/CMakeLists.txt

@@ -17,48 +17,6 @@ find_package(JNI)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 
-#
-# C++ standard library features
-#
-
-include(CheckCXXSourceCompiles)
-
-# ::gets
-check_cxx_source_compiles(
-  "
-#include <cstdio>
-using ::gets;
-int main() {}
-"
-  HAVE_GETS)
-if(HAVE_GETS)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_GETS=1")
-endif()
-
-# std::make_unique
-check_cxx_source_compiles(
-  "
-#include <memory>
-using std::make_unique;
-int main() {}
-"
-  HAVE_MAKE_UNIQUE)
-if(HAVE_MAKE_UNIQUE)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_MAKE_UNIQUE=1")
-endif()
-
-# std::to_string
-check_cxx_source_compiles(
-  "
-#include <string>
-using std::to_string;
-int main() {}
-"
-  HAVE_TO_STRING)
-if(HAVE_TO_STRING)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_TO_STRING=1")
-endif()
-
 #
 # Build
 #
@@ -101,7 +59,6 @@ add_library(
   ToxCrypto/ToxCrypto.cpp
   ToxCrypto/ToxCrypto.h
   Tox4j.cpp
-  cpp14compat.h
   tox4j/ToxInstances.h
   tox4j/Tox4j.h
   tox/av.cpp

lib/src/jvmMain/cpp/ToxAv/lifecycle.cpp

@@ -1,3 +1,5 @@
+#include <memory>
+
 #include "ToxAv.h"
 #include "../ToxCore/ToxCore.h"
 
@@ -122,7 +124,7 @@ TOX_METHOD (jint, New,
               tox4j_assert (toxav != nullptr);
 
               // Create the master events object and set up our callbacks.
-              auto events = tox::callbacks<ToxAV> (make_unique<Events> ())
+              auto events = tox::callbacks<ToxAV> (std::make_unique<Events> ())
 #define CALLBACK(NAME)   .set<tox::callback_##NAME, tox4j_##NAME##_cb> ()
 #include "tox/generated/av.h"
 #undef CALLBACK

lib/src/jvmMain/cpp/ToxCore/lifecycle.cpp

@@ -1,3 +1,5 @@
+#include <memory>
+
 #include "ToxCore.h"
 
 using namespace core;
@@ -269,7 +271,7 @@ TOX_METHOD (jint, New,
         tox4j_assert (tox != nullptr);
 
         // Create the master events object and set up our callbacks.
-        auto events = tox::callbacks<Tox> (make_unique<Events> ())
+        auto events = tox::callbacks<Tox> (std::make_unique<Events> ())
 #define CALLBACK(NAME)   .set<tox::callback_##NAME, tox4j_##NAME##_cb> ()
 #include "tox/generated/core.h"
 #undef CALLBACK

lib/src/jvmMain/cpp/cpp14compat.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include "cpp14compat.h"
-
 #include "ToxInstances.h"
 #include "util/jni/ArrayFromJava.h"
 #include "util/jni/ArrayToJava.h"

lib/src/jvmMain/cpp/tox4j/Tox4j.h

@@ -1,9 +1,8 @@
 #pragma once
 
+#include <type_traits>
 #include <utility>
 
-#include "cpp14compat.h"
-
 /**
  * Helper template to capture the return value of a function call so that
  * functions returning void can be treated the same way as non-void ones.