Merge branch 'master' into feature-amalgamation

Author: baylesj

src/lib_json/CMakeLists.txt

@@ -7,7 +7,6 @@ include(CheckIncludeFileCXX)
 include(CheckTypeSize)
 include(CheckStructHasMember)
 include(CheckCXXSymbolExists)
-include(CheckCXXSourceCompiles)
 
 check_include_file_cxx(clocale HAVE_CLOCALE)
 check_cxx_symbol_exists(localeconv clocale HAVE_LOCALECONV)
@@ -26,11 +25,6 @@ if(NOT (HAVE_CLOCALE AND HAVE_LCONV_SIZE AND HAVE_DECIMAL_POINT AND HAVE_LOCALEC
     endif()
 endif()
 
-check_cxx_source_compiles(
-    "#include <string_view>
-     int main() { std::string_view sv; return 0; }"
-    JSONCPP_HAS_STRING_VIEW)
-
 set(JSONCPP_INCLUDE_DIR ../../include)
 
 set(PUBLIC_HEADERS

src/lib_json/json_value.cpp

@@ -17,10 +17,6 @@
 #include <sstream>
 #include <utility>
 
-#ifdef JSONCPP_HAS_STRING_VIEW
-#include <string_view>
-#endif
-
 // Provide implementation equivalent of std::snprintf for older _MSC compilers
 #if defined(_MSC_VER) && _MSC_VER < 1900
 #include <stdarg.h>