Modify IPS4O to be C++11 compliant

Author: pmenon

test/codegen/oa_hash_table_test.cpp

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <unordered_map>
+#include <random>
 
 #include "common/harness.h"
 

third_party/ips4o/ips4o/buffers.hpp

@@ -128,8 +128,14 @@ class Sorter<Cfg>::Block {
     }
 
  private:
+#if __cplusplus==201402L
     using storage_type = std::conditional_t<kInitializedStorage, value_type,
                                             std::aligned_storage_t<sizeof(value_type), alignof(value_type)>>;
+#else
+    // pmenon: Modified for C++11
+    using storage_type = typename std::conditional<kInitializedStorage, value_type,
+                                                   typename std::aligned_storage<sizeof(value_type), alignof(value_type)>::type>::type;
+#endif
     storage_type storage_[Cfg::kBlockSize];
 };
 

third_party/ips4o/ips4o/classifier.hpp

@@ -207,9 +207,20 @@ class Sorter<Cfg>::Classifier {
     }
 
     // Filled from 1 to num_buckets_
+#if __cplusplus==201402L
     std::aligned_storage_t<sizeof(value_type), alignof(value_type)> storage_[Cfg::kMaxBuckets / 2];
+#else
+    // pmenon: Modified for C++11
+    typename std::aligned_storage<sizeof(value_type), alignof(value_type)>::type storage_[Cfg::kMaxBuckets / 2];
+#endif
     // Filled from 0 to num_buckets_, last one is duplicated
+#if __cplusplus==201402L
     std::aligned_storage_t<sizeof(value_type), alignof(value_type)> sorted_storage_[Cfg::kMaxBuckets / 2];
+#else
+    // pmenon: Modified for C++11
+    typename std::aligned_storage<sizeof(value_type), alignof(value_type)>::type sorted_storage_[Cfg::kMaxBuckets / 2];
+#endif
+
     int log_buckets_ = 0;
     bucket_type num_buckets_ = 0;
     less comp_;

third_party/ips4o/ips4o/config.hpp

@@ -160,8 +160,15 @@ struct Config {
      * The oversampling factor to be used for input of size n.
      */
     static constexpr double oversamplingFactor(std::ptrdiff_t n) {
-        const double f = OversampleF_ / 100.0 * detail::log2(n);
+#if __cplusplus==201402L
+        constexpr double f = OversampleF_ / 100.0 * detail::log2(n);
         return f < 1.0 ? 1.0 : f;
+#else
+        // pmenon: Modified for C++11
+#define f (OversampleF_ / 100.0 * detail::log2(n))
+        return f < 1.0 ? 1.0 : f;
+#undef f
+#endif
     }
 
     /**

third_party/ips4o/ips4o/ips4o.hpp

@@ -51,15 +51,25 @@ namespace ips4o {
 /**
  * Helper function for creating a reusable sequential sorter.
  */
+#if __cplusplus==201402L
 template <class It, class Cfg = Config<>, class Comp = std::less<>>
+#else
+// pmenon: Modified for C++11
+template <class It, class Cfg = Config<>, class Comp>
+#endif
 SequentialSorter<ExtendedConfig<It, Comp, Cfg>> make_sorter(Comp comp = Comp()) {
     return SequentialSorter<ExtendedConfig<It, Comp, Cfg>>{std::move(comp)};
 }
 
 /**
  * Configurable interface.
  */
+#if __cplusplus==201402L
 template <class Cfg, class It, class Comp = std::less<>>
+#else
+// pmenon: Modified for C++11
+template <class Cfg, class It, class Comp>
+#endif
 void sort(It begin, It end, Comp comp = Comp()) {
     if ((end - begin) <= Cfg::kBaseCaseMultiplier * Cfg::kBaseCaseSize)
         detail::baseCaseSort(std::move(begin), std::move(end), std::move(comp));
@@ -75,10 +85,12 @@ void sort(It begin, It end, Comp comp) {
     ips4o::sort<Config<>>(std::move(begin), std::move(end), std::move(comp));
 }
 
+#if 0
 template <class It>
 void sort(It begin, It end) {
     ips4o::sort<Config<>>(std::move(begin), std::move(end), std::less<>());
 }
+#endif
 
 #if defined(_REENTRANT) || defined(_OPENMP)
 namespace parallel {