Merge pull request #1015 from dimacurrentai/cpp14

Remove warnings in C++14 mode (i.e. w/o `-std=c++17`).

Rationale: when playing with Rust-first builds, this C++ code is often build from within containers by various compilers, and almost everything but not quite everything works w/o `-std=c++17` — so I figured it's worthy of half an hour to make it all work w/o `-std=c++17`.'

Author: dkorolev

blocks/http/request.h

@@ -97,7 +97,7 @@ struct Request final {
 
   // A shortcut to allow `[](Request r) { r("OK"); }` instead of `r.connection.SendHTTPResponse("OK")`.
   template <typename T, typename... TS>
-  std::enable_if_t<!std::is_base_of_v<IHasDoRespondViaHTTP, current::decay_t<T>>> operator()(T&& arg, TS&&... args) {
+  std::enable_if_t<!std::is_base_of<IHasDoRespondViaHTTP, current::decay_t<T>>::value> operator()(T&& arg, TS&&... args) {
     if (!unique_connection) {
       CURRENT_THROW(net::AttemptedToSendHTTPResponseMoreThanOnce());
     }
@@ -106,7 +106,7 @@ struct Request final {
 
   // Support `Response`, as well as custom objects with user-defined HTTP response handlers.
   template <class T>
-  std::enable_if_t<std::is_base_of_v<IHasDoRespondViaHTTP, current::decay_t<T>>> operator()(T&& response) {
+  std::enable_if_t<std::is_base_of<IHasDoRespondViaHTTP, current::decay_t<T>>::value> operator()(T&& response) {
     if (!unique_connection) {
       CURRENT_THROW(net::AttemptedToSendHTTPResponseMoreThanOnce());
     }

blocks/http/response.h

@@ -85,7 +85,7 @@ struct Response final : IHasDoRespondViaHTTP {
   Response& operator=(const Response&) = default;
   Response& operator=(Response&&) = default;
 
-  template <typename ARG, typename... ARGS, class = std::enable_if_t<!std::is_same_v<Response, current::decay_t<ARG>>>>
+  template <typename ARG, typename... ARGS, class = std::enable_if_t<!std::is_same<Response, current::decay_t<ARG>>::value>>
   Response(ARG&& arg, ARGS&&... args) : initialized(true) {
     Construct(std::forward<ARG>(arg), std::forward<ARGS>(args)...);
   }

blocks/ss/persister.h

@@ -153,12 +153,12 @@ class EntryPersister : public GenericEntryPersister<ENTRY>, public IMPL {
 // For `static_assert`-s.
 template <typename T>
 struct IsPersister {
-  static constexpr bool value = std::is_base_of_v<GenericPersister, T>;
+  static constexpr bool value = std::is_base_of<GenericPersister, T>::value;
 };
 
 template <typename T, typename E>
 struct IsEntryPersister {
-  static constexpr bool value = std::is_base_of_v<GenericEntryPersister<E>, T>;
+  static constexpr bool value = std::is_base_of<GenericEntryPersister<E>, T>::value;
 };
 
 }  // namespace ss

blocks/ss/pubsub.h

@@ -107,17 +107,17 @@ class StreamPublisher : public GenericStreamPublisher<ENTRY>, public EntryPublis
 // TODO(dkorolev): `Variant` stream types, and publishing those?
 template <typename T>
 struct IsPublisher {
-  static constexpr bool value = std::is_base_of_v<GenericPublisher, current::decay_t<T>>;
+  static constexpr bool value = std::is_base_of<GenericPublisher, current::decay_t<T>>::value;
 };
 
 template <typename T, typename E>
 struct IsEntryPublisher {
-  static constexpr bool value = std::is_base_of_v<GenericEntryPublisher<current::decay_t<E>>, current::decay_t<T>>;
+  static constexpr bool value = std::is_base_of<GenericEntryPublisher<current::decay_t<E>>, current::decay_t<T>>::value;
 };
 
 template <typename T, typename E>
 struct IsStreamPublisher {
-  static constexpr bool value = std::is_base_of_v<GenericStreamPublisher<current::decay_t<E>>, current::decay_t<T>>;
+  static constexpr bool value = std::is_base_of<GenericStreamPublisher<current::decay_t<E>>, current::decay_t<T>>::value;
 };
 
 enum class EntryResponse { Done = 0, More = 1 };
@@ -162,17 +162,17 @@ class StreamSubscriber : public GenericStreamSubscriber<ENTRY>, public EntrySubs
 // For `static_assert`-s. Must `decay_t<>` for template xvalue references support.
 template <typename T>
 struct IsSubscriber {
-  static constexpr bool value = std::is_base_of_v<GenericSubscriber, current::decay_t<T>>;
+  static constexpr bool value = std::is_base_of<GenericSubscriber, current::decay_t<T>>::value;
 };
 
 template <typename T, typename E>
 struct IsEntrySubscriber {
-  static constexpr bool value = std::is_base_of_v<GenericEntrySubscriber<current::decay_t<E>>, current::decay_t<T>>;
+  static constexpr bool value = std::is_base_of<GenericEntrySubscriber<current::decay_t<E>>, current::decay_t<T>>::value;
 };
 
 template <typename T, typename E>
 struct IsStreamSubscriber {
-  static constexpr bool value = std::is_base_of_v<GenericStreamSubscriber<current::decay_t<E>>, current::decay_t<T>>;
+  static constexpr bool value = std::is_base_of<GenericStreamSubscriber<current::decay_t<E>>, current::decay_t<T>>::value;
 };
 
 namespace impl {

blocks/ss/types.h

@@ -37,7 +37,7 @@ template <typename ENTRY, typename STREAM_ENTRY>
 #ifndef CURRENT_FOR_CPP14
 inline
 #endif  // CURRENT_FOR_CPP14
-    constexpr bool can_publish_v = std::is_constructible_v<STREAM_ENTRY, ENTRY>;
+    constexpr bool can_publish_v = std::is_constructible<STREAM_ENTRY, ENTRY>::value;
 
 }  // namespace ss
 }  // namespace current

blocks/xterm/progress.h

@@ -101,7 +101,7 @@ class ProgressLine final {
     }
 
     // The `std::enable_if_t` is necessary, as well as `current::decay`, because of `vt100::Color`. -- D.K.
-    template <typename T, class = std::enable_if_t<!std::is_base_of_v<vt100::E, current::decay_t<T>>>>
+    template <typename T, class = std::enable_if_t<!std::is_base_of<vt100::E, current::decay_t<T>>::value>>
     Status& operator<<(T&& whatever) {
       oss_text << whatever;
       oss_text_with_no_vt100_escape_sequences << whatever;

bricks/dflags/dflags.h

@@ -273,7 +273,7 @@ class FlagRegisterer : public FlagRegistererBase {
     }
   }
 
-  bool IsBooleanFlag() const override { return std::is_same_v<FLAG_TYPE, bool>; }
+  bool IsBooleanFlag() const override { return std::is_same<FLAG_TYPE, bool>::value; }
 
   std::string TypeAsString() const override { return type_; }
 

bricks/dflags/test.cc

@@ -35,13 +35,16 @@ SOFTWARE.
 #include <string>
 #include <sstream>
 
+template <typename A, typename B>
+constexpr bool is_same_v = std::is_same<A, B>::value;
+
 TEST(DFlags, DefinesAFlag) {
   ::dflags::FlagsManager::DefaultRegisterer local_registerer;
   auto local_registerer_scope = ::dflags::FlagsManager::ScopedSingletonInjector(local_registerer);
   DEFINE_int8(foo, 42, "");
   DEFINE_uint8(bar, 42, "");
-  static_assert(std::is_same_v<decltype(FLAGS_foo), int8_t>, "");
-  static_assert(std::is_same_v<decltype(FLAGS_bar), uint8_t>, "");
+  static_assert(is_same_v<decltype(FLAGS_foo), int8_t>, "");
+  static_assert(is_same_v<decltype(FLAGS_bar), uint8_t>, "");
   EXPECT_EQ(42, FLAGS_foo);
   EXPECT_EQ(42, FLAGS_bar);
   FLAGS_foo = -1;
@@ -56,7 +59,7 @@ TEST(DFlags, ParsesAFlagUsingSingleDash) {
   ::dflags::FlagsManager::DefaultRegisterer local_registerer;
   auto local_registerer_scope = ::dflags::FlagsManager::ScopedSingletonInjector(local_registerer);
   DEFINE_int16(foo, 1, "");
-  static_assert(std::is_same_v<decltype(FLAGS_foo), int16_t>, "");
+  static_assert(is_same_v<decltype(FLAGS_foo), int16_t>, "");
   EXPECT_EQ(1, FLAGS_foo);
   int argc = 3;
   char p1[] = "./ParsesAFlagUsingSingleDash";
@@ -74,7 +77,7 @@ TEST(DFlags, ParsesAFlagUsingDoubleDash) {
   ::dflags::FlagsManager::DefaultRegisterer local_registerer;
   auto local_registerer_scope = ::dflags::FlagsManager::ScopedSingletonInjector(local_registerer);
   DEFINE_uint16(bar, 1, "");
-  static_assert(std::is_same_v<decltype(FLAGS_bar), uint16_t>, "");
+  static_assert(is_same_v<decltype(FLAGS_bar), uint16_t>, "");
   EXPECT_EQ(1, FLAGS_bar);
   int argc = 3;
   char p1[] = "./ParsesAFlagUsingDoubleDash";
@@ -92,7 +95,7 @@ TEST(DFlags, ParsesAFlagUsingSingleDashEquals) {
   ::dflags::FlagsManager::DefaultRegisterer local_registerer;
   auto local_registerer_scope = ::dflags::FlagsManager::ScopedSingletonInjector(local_registerer);
   DEFINE_int32(baz, 1, "");
-  static_assert(std::is_same_v<decltype(FLAGS_baz), int32_t>, "");
+  static_assert(is_same_v<decltype(FLAGS_baz), int32_t>, "");
   EXPECT_EQ(1, FLAGS_baz);
   int argc = 2;
   char p1[] = "./ParsesAFlagUsingSingleDashEquals";
@@ -109,7 +112,7 @@ TEST(DFlags, ParsesAFlagUsingDoubleDashEquals) {
   ::dflags::FlagsManager::DefaultRegisterer local_registerer;
   auto local_registerer_scope = ::dflags::FlagsManager::ScopedSingletonInjector(local_registerer);
   DEFINE_uint32(meh, 1, "");
-  static_assert(std::is_same_v<decltype(FLAGS_meh), uint32_t>, "");
+  static_assert(is_same_v<decltype(FLAGS_meh), uint32_t>, "");
   EXPECT_EQ(1u, FLAGS_meh);
   int argc = 2;
   char p1[] = "./ParsesAFlagUsingDoubleDashEquals";
@@ -142,12 +145,12 @@ TEST(DFlags, ParsesMultipleFlags) {
   DEFINE_int64(flag_int64, 0, "");
   DEFINE_uint64(flag_uint64, 0u, "");
   DEFINE_size_t(flag_size_t, 0u, "");
-  static_assert(std::is_same_v<decltype(FLAGS_flag_string), std::string>, "");
-  static_assert(std::is_same_v<decltype(FLAGS_flag_bool1), bool>, "");
-  static_assert(std::is_same_v<decltype(FLAGS_flag_bool2), bool>, "");
-  static_assert(std::is_same_v<decltype(FLAGS_flag_int64), int64_t>, "");
-  static_assert(std::is_same_v<decltype(FLAGS_flag_uint64), uint64_t>, "");
-  static_assert(std::is_same_v<decltype(FLAGS_flag_size_t), size_t>, "");
+  static_assert(is_same_v<decltype(FLAGS_flag_string), std::string>, "");
+  static_assert(is_same_v<decltype(FLAGS_flag_bool1), bool>, "");
+  static_assert(is_same_v<decltype(FLAGS_flag_bool2), bool>, "");
+  static_assert(is_same_v<decltype(FLAGS_flag_int64), int64_t>, "");
+  static_assert(is_same_v<decltype(FLAGS_flag_uint64), uint64_t>, "");
+  static_assert(is_same_v<decltype(FLAGS_flag_size_t), size_t>, "");
   EXPECT_EQ("", FLAGS_flag_string);
   EXPECT_FALSE(FLAGS_flag_bool1);
   EXPECT_TRUE(FLAGS_flag_bool2);
@@ -182,7 +185,7 @@ TEST(DFlags, ParsesEmptyString) {
   ::dflags::FlagsManager::DefaultRegisterer local_registerer;
   auto local_registerer_scope = ::dflags::FlagsManager::ScopedSingletonInjector(local_registerer);
   DEFINE_string(empty_string, "not yet", "");
-  static_assert(std::is_same_v<decltype(FLAGS_empty_string), std::string>, "");
+  static_assert(is_same_v<decltype(FLAGS_empty_string), std::string>, "");
   EXPECT_EQ("not yet", FLAGS_empty_string);
   int argc = 3;
   char p1[] = "./ParsesEmptyString";
@@ -198,7 +201,7 @@ TEST(DFlags, ParsesEmptyStringUsingEquals) {
   ::dflags::FlagsManager::DefaultRegisterer local_registerer;
   auto local_registerer_scope = ::dflags::FlagsManager::ScopedSingletonInjector(local_registerer);
   DEFINE_string(empty_string, "not yet", "");
-  static_assert(std::is_same_v<decltype(FLAGS_empty_string), std::string>, "");
+  static_assert(is_same_v<decltype(FLAGS_empty_string), std::string>, "");
   EXPECT_EQ("not yet", FLAGS_empty_string);
   int argc = 2;
   char p1[] = "./ParsesEmptyStringUsingEquals";

bricks/distributed/test.cc

@@ -30,27 +30,26 @@ SOFTWARE.
 using namespace std::chrono_literals;
 
 TEST(VectorClock, SmokeTest) {
-  auto v = VectorClock();
+  auto v = VectorClock<>();
   v.Step();
 
   auto data = DiscreteClocks(1);
   EXPECT_FALSE(v.AdvanceTo(data)) << "Merge from future should return false.";
   EXPECT_EQ(v.State().size(), static_cast<size_t>(1));
 
-  auto v2 = VectorClock(data, 0);
+  auto v2 = VectorClock<>(data, 0);
   EXPECT_TRUE(v2.AdvanceTo(data)) << "Test lte t==t'.";
 }
 
 TEST(VectorClock, ToString) {
   DiscreteClocks c1 = {1, 2};
-  auto v = VectorClock(c1, 0);
+  auto v = VectorClock<>(c1, 0);
   EXPECT_EQ(v.ToString(), "VCLOCK ID=0: [1, 2]");
 }
 
 TEST(VectorClock, Merge) {
-  auto base_time = current::time::Now();
   DiscreteClocks c1 = {1, 2};
-  auto v = VectorClock(c1, 0);
+  auto v = VectorClock<>(c1, 0);
 
   // Merge correct update
   DiscreteClocks c2 = {2, 3};
@@ -65,14 +64,14 @@ TEST(VectorClock, Merge) {
   EXPECT_EQ(v.State()[1], cur_state[1]);
 
   // Merge partially equals using lte validation
-  v = VectorClock(c1, 0);
+  v = VectorClock<>(c1, 0);
   c2 = {1, 3};
   EXPECT_TRUE(v.AdvanceTo(c2)) << "0 is equals, 1 is greater - ok to merge.";
   cur_state = v.State();
   EXPECT_GT(cur_state[0], c2[0]) << "Local time should be updated after merge.";
   EXPECT_EQ(c2[1], cur_state[1]) << "Merged time should be equal c2[1].";
 
-  v = VectorClock(c1, 0);
+  v = VectorClock<>(c1, 0);
   cur_state = v.State();
   c2 = DiscreteClocks({1, 0});
   EXPECT_FALSE(v.AdvanceTo(c2)) << "Merge partially incorrect.";
@@ -96,7 +95,6 @@ TEST(VectorClock, ContinuousTime) {
 }
 
 TEST(VectorClock, StrictMerge) {
-  auto base_time = current::time::Now();
   DiscreteClocks c1 = {1, 2};
   auto v = VectorClock<DiscreteClocks, StrictMergeStrategy>(c1, 0);
 

bricks/net/http/impl/server.h

@@ -820,9 +820,9 @@ class GenericHTTPServerConnection final : public HTTPResponder {
 
       // Only support STL containers of chars and bytes, this does not yet cover std::string.
       template <typename T>
-      inline std::enable_if_t<std::is_same_v<typename T::value_type, char> ||
-                              std::is_same_v<typename T::value_type, uint8_t> ||
-                              std::is_same_v<typename T::value_type, int8_t>>
+      inline std::enable_if_t<std::is_same<typename T::value_type, char>::value ||
+                              std::is_same<typename T::value_type, uint8_t>::value ||
+                              std::is_same<typename T::value_type, int8_t>::value>
       Send(T&& data, ChunkFlush flush) {
         SendImpl(std::forward<T>(data), flush);
       }