Merge branch 'develop' into feature/constexpr

.travis.yml

@@ -28,6 +28,26 @@ matrix:
       compiler: g++
       env: TOOLSET=gcc COMPILER=g++ CXXSTD=03,11
 
+    - os: linux
+      compiler: g++-4.4
+      env: TOOLSET=gcc COMPILER=g++-4.4 CXXSTD=98,0x
+      addons:
+        apt:
+          packages:
+            - g++-4.4
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: g++-4.6
+      env: TOOLSET=gcc COMPILER=g++-4.6 CXXSTD=03,0x
+      addons:
+        apt:
+          packages:
+            - g++-4.6
+          sources:
+            - ubuntu-toolchain-r-test
+
     - os: linux
       compiler: g++-4.7
       env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=03,11
@@ -202,7 +222,7 @@ install:
 script:
   - |-
     echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
-  - ./b2 -j 3 libs/system/test toolset=$TOOLSET cxxstd=$CXXSTD
+  - ./b2 -j3 libs/system/test toolset=$TOOLSET cxxstd=$CXXSTD
 
 notifications:
   email:

test/Jamfile.v2

@@ -25,7 +25,11 @@ project
    {
       local result ;
 
-      if <toolset>gcc in $(properties) || <toolset>clang in $(properties)
+      if <toolset>gcc in $(properties)
+      {
+         result = <cxxflags>-std=c++98 ; # 4.4 has no 03
+      }
+      else if <toolset>clang in $(properties)
       {
          result = <cxxflags>-std=c++03 ;
       }
@@ -41,11 +45,11 @@ project
    {
       local result ;
 
-      if <toolset-gcc:version>4.6 in $(properties)
+      if <toolset>gcc in $(properties)
       {
-         result = <cxxflags>-std=c++0x ;
+         result = <cxxflags>-std=c++0x ; # 4.6 has no 11
       }
-      else if <toolset>gcc in $(properties) || <toolset>clang in $(properties)
+      else if <toolset>clang in $(properties)
       {
          result = <cxxflags>-std=c++11 ;
       }