From 977f8ef145c25d0c53f70ee6f7a36a378166d180 Mon Sep 17 00:00:00 2001 From: Anton Bachin Date: Sun, 23 Aug 2015 11:50:24 -0500 Subject: [PATCH] Replaced testing on G++ 5.1 with G++ 5.2. GCC 5.2 is a "bugfix" release over GCC 5.1 - not sure why the GCC team updated the minor version number. Package managers seem to have dropped GCC 5.1 and replaced it with 5.2, and I'm guessing usage of 5.1 is discouraged. The testing code has been updated accordingly. Travis is still distributing GCC 5.1 as of the time of this writing. --- doc/CompilerSupport.md | 10 +++++----- doc/tutorial/5-map.md | 2 +- example/102-any-underlying.cc | 2 +- example/5-map.cc | 2 +- test/Makefile | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/CompilerSupport.md b/doc/CompilerSupport.md index 08a5d72..19e7379 100644 --- a/doc/CompilerSupport.md +++ b/doc/CompilerSupport.md @@ -3,7 +3,7 @@ Better Enums aims to support all major compilers. It is known to work on: - clang 3.3 to 3.6 - - gcc 4.3 to 5.1 + - gcc 4.3 to 5.2 - Visual C++ 2008 to 2015RC. The library can be used with any compiler that supports either $cxx11, or $cxx98 @@ -91,10 +91,10 @@ clang++34 -std=c++11 -DBETTER_ENUMS_STRICT_CONVERSION clang++34 -std=c++11 -DBETTER_ENUMS_CONSTEXPR_TO_STRING clang++34 -std=c++98 clang++33 -std=c++98 -g++51 -std=c++11 -g++51 -std=c++11 -DBETTER_ENUMS_STRICT_CONVERSION -g++51 -std=c++11 -DBETTER_ENUMS_CONSTEXPR_TO_STRING -g++51 -std=c++98 +g++52 -std=c++11 +g++52 -std=c++11 -DBETTER_ENUMS_STRICT_CONVERSION +g++52 -std=c++11 -DBETTER_ENUMS_CONSTEXPR_TO_STRING +g++52 -std=c++98 g++49 -std=c++11 g++49 -std=c++11 -DBETTER_ENUMS_STRICT_CONVERSION g++49 -std=c++11 -DBETTER_ENUMS_CONSTEXPR_TO_STRING diff --git a/doc/tutorial/5-map.md b/doc/tutorial/5-map.md index 3174ee1..2fa4619 100644 --- a/doc/tutorial/5-map.md +++ b/doc/tutorial/5-map.md @@ -38,7 +38,7 @@ We will create a map from this function: case Channel::Blue: return "the blue channel"; } - return "needed for gcc 5.1"; + return "needed for gcc 5"; } Here is the map. The actual type is `better_enums::map`. diff --git a/example/102-any-underlying.cc b/example/102-any-underlying.cc index 44a7244..cd15932 100644 --- a/example/102-any-underlying.cc +++ b/example/102-any-underlying.cc @@ -132,7 +132,7 @@ int main() // U is for declarations only. // // Constructors in initializers require C++11. Also, g++ doesn't support this -// before 5.1. +// before g++5. // // Letting the compiler enumerate your type // diff --git a/example/5-map.cc b/example/5-map.cc index 3ffcef5..4588e86 100644 --- a/example/5-map.cc +++ b/example/5-map.cc @@ -40,7 +40,7 @@ constexpr const char* describe(Channel channel) case Channel::Blue: return "the blue channel"; } - return "for gcc 5.1"; + return "needed for gcc 5"; } // Here is the map. The actual type is better_enums::map. diff --git a/test/Makefile b/test/Makefile index ab056b7..45437ad 100644 --- a/test/Makefile +++ b/test/Makefile @@ -135,7 +135,7 @@ all-configurations : .PHONY : all-unix all-unix : examples make COMPILER=clang++36 unix - make COMPILER=g++51 unix + make COMPILER=g++52 unix make COMPILER=g++46 unix make COMPILER=g++47 unix make COMPILER=g++43 unix