Merge branch 'develop'

.travis.yml

@@ -5,6 +5,8 @@ language: cpp
 
 sudo: false
 
+dist: trusty
+
 python: "2.7"
 
 branches:
@@ -97,7 +99,6 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      dist: trusty
       compiler: g++-7
       env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=03,11,14,17
       addons:
@@ -109,7 +110,17 @@ matrix:
 
     - os: linux
       compiler: g++-8
-      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14
+      addons:
+        apt:
+          packages:
+            - g++-8
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: g++-8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=17,2a
       addons:
         apt:
           packages:
@@ -121,6 +132,22 @@ matrix:
       compiler: clang++
       env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11
 
+    - os: linux
+      compiler: /usr/bin/clang++
+      env: TOOLSET=clang COMPILER=/usr/bin/clang++ CXXSTD=03,11
+      addons:
+        apt:
+          packages:
+            - clang-3.3
+
+    - os: linux
+      compiler: /usr/bin/clang++
+      env: TOOLSET=clang COMPILER=/usr/bin/clang++ CXXSTD=03,11
+      addons:
+        apt:
+          packages:
+            - clang-3.4
+
     - os: linux
       compiler: clang++-3.5
       env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11,14,1z
@@ -131,6 +158,7 @@ matrix:
             - libstdc++-4.9-dev
           sources:
             - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.5
 
     - os: linux
       compiler: clang++-3.6
@@ -139,9 +167,20 @@ matrix:
         apt:
           packages:
             - clang-3.6
-            - libstdc++-4.9-dev
           sources:
             - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.6
+
+    - os: linux
+      compiler: clang++-3.7
+      env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11,14,1z
+      addons:
+        apt:
+          packages:
+            - clang-3.7
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.7
 
     - os: linux
       compiler: clang++-3.8
@@ -153,6 +192,7 @@ matrix:
             - libstdc++-4.9-dev
           sources:
             - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.8
 
     - os: linux
       compiler: clang++-3.9
@@ -164,6 +204,7 @@ matrix:
             - libstdc++-4.9-dev
           sources:
             - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.9
 
     - os: linux
       compiler: clang++-4.0
@@ -189,7 +230,7 @@ matrix:
 
     - os: linux
       compiler: clang++-6.0
-      env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=03,11,14,17
+      env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=03,11,14,17,2a
       addons:
         apt:
           packages:
@@ -198,6 +239,17 @@ matrix:
             - ubuntu-toolchain-r-test
             - llvm-toolchain-trusty-6.0
 
+    - os: linux
+      compiler: clang++-7
+      env: TOOLSET=clang COMPILER=clang++-7 CXXSTD=03,11,14,17,2a
+      addons:
+        apt:
+          packages:
+            - clang-7
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-7
+
     - os: linux
       compiler: clang++-libc++
       env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=03,11,14,1z

include/boost/circular_buffer/allocators.hpp

@@ -14,7 +14,6 @@
 #elif defined(BOOST_LIBSTDCXX_VERSION) && (BOOST_LIBSTDCXX_VERSION < 40800)
 #define BOOST_CB_NO_CXX11_ALLOCATOR
 #endif
-#include <limits>
 #if !defined(BOOST_CB_NO_CXX11_ALLOCATOR)
 #include <memory>
 #else
@@ -28,16 +27,7 @@ namespace boost {
 namespace cb_details {
 
 #if !defined(BOOST_CB_NO_CXX11_ALLOCATOR)
-template<class A>
-struct allocator_traits
-    : std::allocator_traits<A> {
-    using typename std::allocator_traits<A>::value_type;
-    using typename std::allocator_traits<A>::size_type;
-
-    static size_type max_size(const A&) BOOST_NOEXCEPT {
-        return (std::numeric_limits<size_type>::max)() / sizeof(value_type);
-    }
-};
+using std::allocator_traits;
 #else
 template<class A>
 struct allocator_traits {
@@ -47,8 +37,8 @@ struct allocator_traits {
     typedef typename A::difference_type difference_type;
     typedef typename A::size_type size_type;
 
-    static size_type max_size(const A&) BOOST_NOEXCEPT {
-        return (std::numeric_limits<size_type>::max)() / sizeof(value_type);
+    static size_type max_size(const A& a) BOOST_NOEXCEPT {
+        return a.max_size();
     }
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)

test/common.ipp

@@ -236,6 +236,9 @@ public:
    void destroy(value_type* ptr)
    {  ptr->~value_type();  }
 
+   size_type max_size() const {
+      return ~static_cast<size_type>(0) / sizeof(size_type);
+   }
 };
 
 void allocator_test() {