Remove gcc-4.9 from the travis builds

According to CMake, it does not support templated variables. Strictly
speaking, we added that to the target so that the project defaults
to C++14, but I am planning to use them inside Catch2 anyway.

.travis.yml

@@ -103,14 +103,6 @@ matrix:
 
 
     # GCC builds
-    - os: linux
-      compiler: gcc
-      addons:
-        apt:
-          sources: *all_sources
-          packages: ['g++-4.9']
-      env: COMPILER='g++-4.9' CPP14=1
-
     - os: linux
       compiler: gcc
       addons:

examples/CMakeLists.txt

@@ -138,7 +138,7 @@ add_executable( 207-Rpt-TeamCityReporter ${EXAMPLES_DIR}/207-Rpt-TeamCityReporte
 foreach( name ${TARGETS_ALL} )
     target_include_directories( ${name} PRIVATE ${HEADER_DIR} ${CATCH_DIR} )
 
-    set_property(TARGET ${name} PROPERTY CXX_STANDARD 11)
+    set_property(TARGET ${name} PROPERTY CXX_STANDARD 14)
     set_property(TARGET ${name} PROPERTY CXX_EXTENSIONS OFF)
 
     # Add desired warnings

include/internal/catch_test_registry.cpp

@@ -16,8 +16,6 @@ namespace Catch {
         return new(std::nothrow) TestInvokerAsFunction( testAsFunction );
     }
 
-    NameAndTags::NameAndTags( StringRef const& name_ , StringRef const& tags_ ) noexcept : name( name_ ), tags( tags_ ) {}
-
     AutoReg::AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept {
         CATCH_TRY {
             getMutableRegistryHub()

include/internal/catch_test_registry.h

@@ -37,7 +37,9 @@ auto makeTestInvoker( void (C::*testAsMethod)() ) noexcept -> ITestInvoker* {
 }
 
 struct NameAndTags {
-    NameAndTags( StringRef const& name_ = StringRef(), StringRef const& tags_ = StringRef() ) noexcept;
+    NameAndTags(StringRef const& name_ = StringRef(),
+                StringRef const& tags_ = StringRef()) noexcept:
+        name(name_), tags(tags_) {}
     StringRef name;
     StringRef tags;
 };

projects/CMakeLists.txt

@@ -315,7 +315,7 @@ add_executable(SelfTest ${TEST_SOURCES} ${IMPL_SOURCES} ${REPORTER_SOURCES} ${SU
 target_include_directories(SelfTest PRIVATE ${HEADER_DIR})
 
 # It took CMake until 3.8 to abandon the doomed approach of enumerating
-# required features so we just list C++11 features to support older ones.
+# required features so we just list bunch of C++11 and C++14 features.
 target_compile_features(SelfTest
   PRIVATE
     cxx_alignas
@@ -337,6 +337,7 @@ target_compile_features(SelfTest
     cxx_unicode_literals
     cxx_user_literals
     cxx_variadic_macros
+    cxx_variable_templates
 )
 
 

projects/ExtraTests/CMakeLists.txt

@@ -130,7 +130,7 @@ set_tests_properties(
 if (MSVC)
     # This test fails if it does not compile and succeeds otherwise
     add_executable(WindowsHeader ${TESTS_DIR}/X90-WindowsHeaderInclusion.cpp)
-    set_property( TARGET WindowsHeader PROPERTY CXX_STANDARD 11 )
+    set_property( TARGET WindowsHeader PROPERTY CXX_STANDARD 14 )
     set_property( TARGET WindowsHeader PROPERTY CXX_STANDARD_REQUIRED ON )
     set_property( TARGET WindowsHeader PROPERTY CXX_EXTENSIONS OFF )
     target_include_directories( WindowsHeader PRIVATE ${SINGLE_INCLUDE_PATH} )
@@ -149,7 +149,7 @@ set( EXTRA_TEST_BINARIES
 
 # Shared config
 foreach( test ${EXTRA_TEST_BINARIES} )
-    set_property( TARGET ${test} PROPERTY CXX_STANDARD 11 )
+    set_property( TARGET ${test} PROPERTY CXX_STANDARD 14 )
     set_property( TARGET ${test} PROPERTY CXX_STANDARD_REQUIRED ON )
     set_property( TARGET ${test} PROPERTY CXX_EXTENSIONS OFF )
     target_include_directories( ${test} PRIVATE ${SINGLE_INCLUDE_PATH} )