From 32f05d55ae8f046fd10ef2822cb10630d0162b8c Mon Sep 17 00:00:00 2001
From: Stephan Beyer <s-beyer@gmx.net>
Date: Sun, 24 Jan 2016 14:40:44 +0100
Subject: [PATCH] Use either -std=c++03 or -std=c++11

No intermediate pseudo-standards should be used when compiling.
The option -std=c++11 is used by default now.
Compile with `make defines=PUGIXML_NO_CXX11` to use -std=c++03 instead.
---
 .travis.yml | 6 +++---
 Makefile    | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a7e4840..b5d9db0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,9 @@ os:
   - linux
   - osx
 env:
-  - DEFINES=standard
-  - DEFINES=PUGIXML_WCHAR_MODE
-  - DEFINES=PUGIXML_COMPACT
+  - DEFINES=PUGIXML_NO_CXX11
+  - DEFINES=PUGIXML_NO_CXX11,PUGIXML_WCHAR_MODE
+  - DEFINES=PUGIXML_NO_CXX11,PUGIXML_COMPACT
 script:
   - make test config=coverage defines=$DEFINES -j2
   - make test config=release defines=$DEFINES -j2
diff --git a/Makefile b/Makefile
index 777b82b..a7624f9 100644
--- a/Makefile
+++ b/Makefile
@@ -47,9 +47,10 @@ ifneq ($(findstring PUGIXML_NO_EXCEPTIONS,$(defines)),)
 	CXXFLAGS+=-fno-exceptions
 endif
 
-ifeq ($(findstring PUGIXML_NO_CXX11,$(defines)),)
-	# Can't use std=c++11 since Travis-CI has gcc 4.6.3
-	CXXFLAGS+=-std=c++0x
+ifneq ($(findstring PUGIXML_NO_CXX11,$(defines)),)
+	CXXFLAGS+=-std=c++03
+else
+	CXXFLAGS+=-std=c++11
 endif
 
 OBJECTS=$(SOURCES:%=$(BUILD)/%.o)