Fix several minor issues reported by GCC 7.2 and Clang

Author: saleyn

CMakeLists.txt

@@ -5,7 +5,7 @@ project(utxx VERSION 1.4.1)
 #===============================================================================
 # CMAKE options customization
 #===============================================================================
-option(WITH_THRIFT             "Enable to compile UTXX with Thrift"          ON)
+option(WITH_THRIFT             "Enable to compile UTXX with Thrift"         OFF)
 option(VERBOSE                 "Turn verbosity on|off"                      OFF)
 option(WITH_ENUM_SERIALIZATION "Turn enum serialization support on|off"     OFF)
 
@@ -164,7 +164,7 @@ set(Boost_USE_MULTITHREAD ON)
 set(Boost_NO_SYSTEM_PATHS ON)
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build")
 
-find_package(Boost 1.55.0 REQUIRED COMPONENTS
+find_package(Boost 1.58.0 REQUIRED COMPONENTS
              system filesystem date_time program_options thread regex
              unit_test_framework timer)
 

config.h.in

@@ -8,8 +8,12 @@
 #cmakedefine UTXX_HAVE_THRIFT_H
 
 // This is needed for Thrift:
+#ifndef HAVE_INTTYPES_H
 #cmakedefine HAVE_INTTYPES_H
+#endif
+#ifndef HAVE_NETINET_IN_H
 #cmakedefine HAVE_NETINET_IN_H
+#endif
 
 // Define to 1 if enum.h and enumx.h should be friends of boost::serialization::access
 #cmakedefine UTXX_ENUM_SUPPORT_SERIALIZATION

include/utxx/bitmap.hpp

@@ -200,7 +200,7 @@ class bitmap_high: protected bitmap_low<sizeof(long)*8, T> {
     std::ostream& print(std::ostream& out, const char* sep = "\n") const {
         std::stringstream s;
         for(int i=s_hi_dim-1; i >= 0; --i) {
-            char buf[9];
+            char buf[24];
             if (i != s_lo_dim-1 && (i+1)%8 != 0 && i != s_hi_dim-1) s << '-';
             if ((i+1)%8 == 0 || (s_hi_dim < 8 && i == (s_hi_dim-1))) {
                 sprintf(buf, "%s%02d: ", sep, i+1);

include/utxx/delegate/event.hpp

@@ -116,7 +116,7 @@ namespace utxx
             TSink sink;
 
             wrapper(int a_id, TSink a_sink) : id(a_id), sink(a_sink) {}
-            void operator==(const wrapper& a_rhs) const { return id == a_rhs.id; }
+            bool operator==(const wrapper& a_rhs) const { return id == a_rhs.id; }
         };
 
         typedef std::list<wrapper> sink_list_type;

include/utxx/stream_io.hpp

@@ -109,11 +109,11 @@ bool read_values(std::istream& in, T* a_output, int* a_fields, int a_cnt,
 }
 
 struct indent_t {
-    indent_t(size_t a_level = 0) : m_level(a_level) {}
+    indent_t(int a_level = 0) : m_level(a_level) {}
 
-    size_t level() const { return m_level; }
+    int level() const { return m_level; }
 private:
-    size_t m_level;
+    int m_level;
 };
 
 template <typename Stream = std::stringstream>
@@ -123,7 +123,7 @@ class indented_stream : public Stream {
         : m_level(0), m_indent_width(a_indent_width)
     {}
 
-    size_t level()                    const { return m_level;           }
+    int    level()                    const { return m_level;           }
     size_t indent_width()             const { return m_indent_width;    }
     void   indent_width(size_t a_width)     { m_indent_width = a_width; }
 
@@ -150,8 +150,8 @@ class indented_stream : public Stream {
     indented_stream& operator<<(const T& t) { *((Stream*)this) << t; return *this; }
 
 private:
-    size_t m_level;
+    int    m_level;
     size_t m_indent_width;
 };
 
-} // namespace utxx
+} // namespace utxx

include/utxx/test_helper.hpp

@@ -96,4 +96,4 @@ template <class T> void dont_optimize_var(T&& v) { v = v; }
 template <class T> void dont_optimize_var(T&& v) { asm volatile("":"+r" (v)); }
 #endif
 
-} // namespace utxx::test
+} // namespace utxx::test

src/config_validator.cpp

@@ -294,15 +294,15 @@ void validator::validate
 void validator::internal_fill_fallback_defaults
     (stack_t& stack, option_map& a_scope, std::string const& a_def_branch)
 {
-    auto thrower = [&, this](std::string const& a_opt, std::string const& a_path, int n) {
+    auto thrower = [&](std::string const& a_opt, std::string const& a_path, int n) {
         auto  joiner = [](auto& pair){ return pair.first; };
         auto  path   = join(stack, string("/"), joiner) + a_opt;
         throw runtime_error("Config option '", path,
                             "' has invalid 'defaults' fallback branch (ref",
                             n, "): ", a_path);
     };
 
-    auto get_def_branch = [&, this](std::string const& a_path, const option_map& a_scope) {
+    auto get_def_branch = [&](std::string const& a_path, const option_map& a_scope) {
         const option* res = nullptr;
         if (a_path.empty()) return res;
 
@@ -967,4 +967,4 @@ bool validator::has_required_child_options
 
 
 } // namespace config
-} // namespace utxx
+} // namespace utxx

test/CMakeLists.txt

@@ -89,7 +89,7 @@ XML_CFG(TEST_SRCS test_config_validator2.xml)
 
 # This must be AFTER link_directories
 add_executable(test_utxx ${TEST_SRCS})
-target_compile_definitions(test_utxx PRIVATE -DBOOST_TEST_DYN_LINK)
+target_compile_definitions(test_utxx PRIVATE -DBOOST_ALL_DYN_LINK)
 target_include_directories(test_utxx PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 target_link_libraries(
   test_utxx

test/test_thread_local.cpp

@@ -245,7 +245,7 @@ BOOST_AUTO_TEST_CASE( test_thread_local_access_all_threads_counter ) {
     std::atomic<int> totalAtomic(0);
     std::vector<std::thread> threads;
     for (int i = 0; i < kNumThreads; ++i)
-        threads.push_back(std::thread([&,i]() {
+        threads.push_back(std::thread([&]() {
             stci.add(1);
             totalAtomic.fetch_add(1);
             while (run.load()) { usleep(100); }

test/test_timestamp.cpp

@@ -284,15 +284,15 @@ BOOST_AUTO_TEST_CASE( test_timestamp_format )
     auto v = timestamp::to_string(nsecs(1466441912363349876), utxx::DATE_TIME_WITH_NSEC, false, true);
     BOOST_CHECK_EQUAL("20160620-12:58:32.363349876", v);
 
-    sprintf(expected, "%d%02d%02d-%02d:%02d:%02d",
+    sprintf(expected, "%d%02d%02d-%02ld:%02ld:%02ld",
         (unsigned short) now_local.date().year(),
         (unsigned short) now_local.date().month(),
         (unsigned short) now_local.date().day(),
         now_local.time_of_day().hours(),
         now_local.time_of_day().minutes(),
         now_local.time_of_day().seconds());
 
-    sprintf(expected_utc, "%d%02d%02d-%02d:%02d:%02d",
+    sprintf(expected_utc, "%d%02d%02d-%02ld:%02ld:%02ld",
         (unsigned short) now_utc.date().year(),
         (unsigned short) now_utc.date().month(),
         (unsigned short) now_utc.date().day(),