Merge pull request #58 from offa/compiler_checks_cleanup

Compiler checks cleanup

Author: mattgodbolt

cmake/CompilerCheck.cmake

@@ -16,45 +16,3 @@ else()
     message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
 endif ()
 
-# atomic
-CHECK_INCLUDE_FILE_CXX(atomic HAS_ATOMIC)
-if (NOT HAS_ATOMIC)
-    message(FATAL_ERROR "Seasocks requires a C++ compiler with <atomic>")
-endif ()
-
-# override support
-file(WRITE ${TEMP_DIR}/TestOverride.cpp
-        "struct A { virtual ~A() {} virtual void a() {} };\n
-        struct B : A { void a() override {} };\n
-        int main() { return 0; }"
-)
-
-try_compile(HAVE_OVERRIDE ${TEMP_DIR}
-        ${TEMP_DIR}/TestOverride.cpp
-        COMPILE_DEFINITIONS
-)
-
-if (NOT HAVE_OVERRIDE)
-    message(FATAL_ERROR "Seasocks requires a C++ compiler with support for 'override'")
-endif ()
-
-# emplace support
-file(WRITE ${TEMP_DIR}/TestUnorderedMap.cpp
-        "#include <unordered_map>\n
-        int main() {
-            std::unordered_map<int, int> a;
-            a.emplace(2, 3);
-            return 0;
-        }\n"
-)
-
-try_compile(HAVE_UNORDERED_MAP_EMPLACE ${TEMP_DIR}
-        ${TEMP_DIR}/TestUnorderedMap.cpp
-        COMPILE_DEFINITIONS
-)
-
-if (HAVE_UNORDERED_MAP_EMPLACE)
-    set(HAVE_UNORDERED_MAP_EMPLACE 1)
-else()
-    set(HAVE_UNORDERED_MAP_EMPLACE 0)
-endif ()

cmake/Config.h.in

@@ -1,10 +1,6 @@
 
 #pragma once
 
-/* HAVE_UNORDERED_MAP_EMPLACE */
-#cmakedefine HAVE_UNORDERED_MAP_EMPLACE      @HAVE_UNORDERED_MAP_EMPLACE@
-
-
 namespace seasocks {
 
     constexpr auto version = "@PROJECT_VERSION@";

src/main/c/Connection.cpp

@@ -793,11 +793,7 @@ bool Connection::processHeaders(uint8_t* first, uint8_t* last) {
         const char* key = headerLine;
         const char* value = skipWhitespace(colonPos + 1);
         LS_DEBUG(_logger, "Key: " << key << " || " << value);
-#if HAVE_UNORDERED_MAP_EMPLACE
         headers.emplace(key, value);
-#else
-        headers.insert(std::make_pair(key, value));
-#endif
     }
 
     if (headers.count("Connection") && headers.count("Upgrade")

src/test/c/HeaderMapTests.cpp

@@ -9,11 +9,7 @@ using namespace seasocks;
 namespace {
 
 void emplace(HeaderMap &map, const char *header, const char *value) {
-#if HAVE_UNORDERED_MAP_EMPLACE
     map.emplace(header, value);
-#else
-    map.insert(std::make_pair(header, value));
-#endif
 }
 
 TEST_CASE("shouldConstruct", "[HeaderMapTests]") {