Merge pull request #423 from redboltz/fix_345

Fix 345

Author: redboltz

.travis.yml

@@ -95,7 +95,7 @@ matrix:
       addons: *addonsconfig
 
 script:
-  - CXXFLAGS="${CXXFLAGS} -DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DBOOST_MULTI_INDEX_ENABLE_INVARIANT_CHECKING"
+  - CXXFLAGS="${CXXFLAGS} -pedantic -DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DBOOST_MULTI_INDEX_ENABLE_INVARIANT_CHECKING"
   - mkdir build && cd build && cmake -DCMAKE_CXX_COMPILER="${CXX}" -DCMAKE_C_COMPILER="${CC}" -DCMAKE_LIBRARY_PATH="${BASE}/usr/lib" -DOPENSSL_ROOT_DIR="${OPENSSL_ROOT_DIR}" $FLAGS .. && make check_deps VERBOSE=1 && travis_wait 50 make $MAKEFLAGS VERBOSE=1 && ctest -VV
 
 after_success:

include/mqtt/type_erased_socket.hpp

@@ -17,32 +17,17 @@
 #include <mqtt/namespace.hpp>
 #include <mqtt/shared_any.hpp>
 
-#if BOOST_VERSION >= 106700
-
-namespace MQTT_NS {
-
-// New style boost type_erasure member fucntion concept definition
-BOOST_TYPE_ERASURE_MEMBER(has_async_read, async_read)
-BOOST_TYPE_ERASURE_MEMBER(has_async_write, async_write)
-BOOST_TYPE_ERASURE_MEMBER(has_write, write)
-BOOST_TYPE_ERASURE_MEMBER(has_post, post)
-BOOST_TYPE_ERASURE_MEMBER(has_lowest_layer, lowest_layer)
-BOOST_TYPE_ERASURE_MEMBER(has_close, close)
-
-} // namespace MQTT_NS
-
-#else //  BOOST_VERSION >= 106700
-
-// Old style boost type_erasure member fucntion concept definition
+// I intentionally use old style boost type_erasure member fucntion concept definition.
+// The new style requires compiler extension.
+// If -pedantic compile option is set, then get
+// "must specify at least one argument for '...' parameter of variadic macro"
 BOOST_TYPE_ERASURE_MEMBER((mqtt)(has_async_read), async_read, 3)
 BOOST_TYPE_ERASURE_MEMBER((mqtt)(has_async_write), async_write, 3)
 BOOST_TYPE_ERASURE_MEMBER((mqtt)(has_write), write, 2)
 BOOST_TYPE_ERASURE_MEMBER((mqtt)(has_post), post, 1)
 BOOST_TYPE_ERASURE_MEMBER((mqtt)(has_lowest_layer), lowest_layer, 0)
 BOOST_TYPE_ERASURE_MEMBER((mqtt)(has_close), close, 1)
 
-#endif // BOOST_VERSION >= 106700
-
 namespace MQTT_NS {
 
 namespace as = boost::asio;