Fixing Windows build, more compatibility changes for new HPX version

phylanx/plugins/arithmetics/cumulative_impl.hpp

@@ -401,7 +401,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
         }
 
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_)](primitive_arguments_type&& ops)
             ->  primitive_argument_type
             {

phylanx/plugins/arithmetics/numeric_impl.hpp

@@ -536,7 +536,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
                 value_operand(operands[1], args, name_, codename_, ctx));
         }
 
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_)](primitive_arguments_type&& ops)
             ->  primitive_argument_type
             {

phylanx/plugins/dist_matrixops/dist_argminmax_impl.hpp

@@ -608,7 +608,7 @@ namespace phylanx { namespace dist_matrixops { namespace primitives {
 
         auto this_ = this->shared_from_this();
         return hpx::dataflow(hpx::launch::sync,
-            hpx::util::unwrapping(
+            hpx::unwrapping(
                 [this_ = std::move(this_)](
                     execution_tree::primitive_arguments_type&& args)
                     -> execution_tree::primitive_argument_type {

phylanx/plugins/dist_statistics/dist_statistics_base_impl.hpp

@@ -234,7 +234,7 @@ namespace phylanx { namespace execution_tree { namespace primitives {
 
         auto ctx_copy = ctx;
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_), ctx = std::move(ctx)](
                 primitive_arguments_type&& args) mutable
             -> primitive_argument_type

phylanx/plugins/matrixops/argminmax_impl.hpp

@@ -100,7 +100,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
         }
 
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_)](primitive_arguments_type&& args)
             -> primitive_argument_type
             {

phylanx/plugins/statistics/statistics_base_impl.hpp

@@ -58,7 +58,7 @@ namespace phylanx { namespace execution_tree { namespace primitives {
 
         auto ctx_copy = ctx;
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_), ctx = std::move(ctx)](
                 primitive_arguments_type&& args) mutable
             -> primitive_argument_type

src/CMakeLists.txt

@@ -117,6 +117,9 @@ set_property(TARGET phylanx_component APPEND
 
 target_compile_definitions(
     phylanx_component PUBLIC $<$<CONFIG:Debug>:PHYLANX_DEBUG>)
+if(MSVC)
+  target_compile_definitions(phylanx_component PUBLIC NOMINMAX)
+endif()
 
 get_property(PHYLANX_TARGET_COMPILE_OPTIONS_VAR
   GLOBAL PROPERTY PHYLANX_TARGET_COMPILE_OPTIONS)

src/execution_tree/primitives/call_function.cpp

@@ -83,7 +83,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
         }
 
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
                 [this_ = std::move(this_), ctx](
                         primitive_argument_type&& func,
                         primitive_arguments_type&& args) mutable

src/execution_tree/primitives/console_output.cpp

@@ -58,7 +58,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
         primitive_arguments_type const& args, eval_context ctx) const
     {
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_)](primitive_arguments_type&& args)
                 -> primitive_argument_type
             {

src/execution_tree/primitives/debug_output.cpp

@@ -64,7 +64,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
         primitive_arguments_type const& args, eval_context ctx) const
     {
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_)](args_type && args)
             -> primitive_argument_type
             {

src/execution_tree/primitives/find_all_localities.cpp

@@ -57,7 +57,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
         primitive_arguments_type const& args, eval_context ctx) const
     {
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_)](primitive_arguments_type&& args)
                 -> primitive_argument_type
             {

src/execution_tree/primitives/format_string.cpp

@@ -291,7 +291,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
         auto ctx_copy = ctx;
 
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_), ctx = std::move(ctx)](
                 primitive_arguments_type&& args) mutable
             ->  primitive_argument_type

src/execution_tree/primitives/phyname.cpp

@@ -67,7 +67,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
         }
 
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_)](primitive_argument_type&& arg)
                 -> primitive_argument_type
             {

src/execution_tree/primitives/phytype.cpp

@@ -68,7 +68,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
         }
 
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_)](primitive_argument_type&& arg)
                 -> primitive_argument_type
             {

src/execution_tree/primitives/string_output.cpp

@@ -60,7 +60,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
         primitive_arguments_type const& args, eval_context ctx) const
     {
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_)](args_type && args)
             -> primitive_argument_type
             {

src/plugins/algorithms/als.cpp

@@ -224,7 +224,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
 
         auto this_ = this->shared_from_this();
         return hpx::dataflow(hpx::launch::sync,
-            hpx::util::unwrapping(
+            hpx::unwrapping(
                 [this_ = std::move(this_)](primitive_arguments_type&& args)
                     -> primitive_argument_type
                 {

src/plugins/algorithms/kmeans.cpp

@@ -283,7 +283,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
 
         auto this_ = this->shared_from_this();
         return hpx::dataflow(hpx::launch::sync,
-            hpx::util::unwrapping(
+            hpx::unwrapping(
                 [this_ = std::move(this_)](primitive_arguments_type&& args)
                     -> primitive_argument_type
                 {

src/plugins/algorithms/lda.cpp

@@ -193,7 +193,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
 
         auto this_ = this->shared_from_this();
         return hpx::dataflow(hpx::launch::sync,
-            hpx::util::unwrapping(
+            hpx::unwrapping(
                 [this_ = std::move(this_)](primitive_arguments_type&& args)
                     -> primitive_argument_type
                 {

src/plugins/algorithms/lra.cpp

@@ -171,7 +171,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
         }
 
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_)](primitive_arguments_type && args)
             ->  primitive_argument_type
             {

src/plugins/arithmetics/add_operation.cpp

@@ -191,7 +191,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
                 value_operand(operands[1], args, name_, codename_, ctx));
         }
 
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_)](primitive_arguments_type&& ops)
             ->  primitive_argument_type
             {

src/plugins/arithmetics/mod_operation.cpp

@@ -78,7 +78,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
         auto this_ = this->shared_from_this();
 
         return hpx::dataflow(hpx::launch::sync,
-            hpx::util::unwrapping([this_ = std::move(this_)](
+            hpx::unwrapping([this_ = std::move(this_)](
                                       primitive_arguments_type&& args)
                                       -> primitive_argument_type
             {

src/plugins/arithmetics/unary_minus_operation.cpp

@@ -274,7 +274,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
         }
 
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_)](primitive_argument_type && op)
             -> primitive_argument_type
             {

src/plugins/booleans/unary_not_operation.cpp

@@ -155,7 +155,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
         }
 
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_)](operands_type&& ops)
             -> primitive_argument_type
             {

src/plugins/controls/apply.cpp

@@ -75,7 +75,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
         auto&& arg = list_operand(operands_[1], params, name_, codename_, ctx);
 
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_), ctx = std::move(ctx)](
                 primitive_argument_type&& func, ir::range&& list) mutable
             {

src/plugins/controls/filter_operation.cpp

@@ -92,7 +92,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
         }
 
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_), ctx](
                     primitive_argument_type&& bound_func, ir::range&& list)
             mutable ->  primitive_argument_type

src/plugins/controls/fmap_operation.cpp

@@ -556,7 +556,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
             std::back_inserter(lists));
 
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_), ctx](
                     primitive_argument_type&& bound_func,
                     primitive_arguments_type&& args) mutable

src/plugins/controls/fold_left_operation.cpp

@@ -335,7 +335,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
         }
 
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_), ctx](
                     primitive_argument_type&& bound_func,
                     primitive_argument_type&& initial,

src/plugins/controls/fold_right_operation.cpp

@@ -348,7 +348,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
 
         auto this_ = this->shared_from_this();
         return hpx::dataflow(hpx::launch::sync,
-            hpx::util::unwrapping([this_ = std::move(this_), ctx](
+            hpx::unwrapping([this_ = std::move(this_), ctx](
                     primitive_argument_type&& bound_func,
                     primitive_argument_type&& initial,
                     primitive_argument_type&& data)

src/plugins/controls/parallel_block_operation.cpp

@@ -62,7 +62,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
 
         // Evaluate condition of while statement
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_)](primitive_arguments_type && ops)
             ->  primitive_argument_type
             {

src/plugins/controls/parallel_map_operation.cpp

@@ -59,7 +59,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
         primitive_arguments_type const& args, eval_context ctx) const
     {
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_), ctx](
                     primitive_argument_type&& bound_func, ir::range&& list)
             ->  hpx::future<primitive_argument_type>
@@ -88,7 +88,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
                     result.push_back(p->eval(std::move(args), ctx));
                 }
 
-                return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+                return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
                     [](primitive_arguments_type&& result)
                     -> primitive_argument_type
                     {
@@ -113,7 +113,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
             std::back_inserter(lists));
 
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_), ctx](
                 primitive_argument_type&& bound_func,
                 std::vector<ir::range, arguments_allocator<ir::range>>&& lists)
@@ -174,7 +174,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
                     result.push_back(p->eval(std::move(args), ctx));
                 }
 
-                return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+                return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
                     [](primitive_arguments_type&& result)
                     -> primitive_argument_type
                     {

src/plugins/controls/range_operation.cpp

@@ -110,7 +110,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
         }
 
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_)](args_type&& args)
             -> primitive_argument_type
             {

src/plugins/dist_keras_support/dist_conv1d.cpp

@@ -335,7 +335,7 @@ namespace phylanx { namespace dist_keras_support { namespace primitives
 
         auto this_ = this->shared_from_this();
         return hpx::dataflow(hpx::launch::sync,
-            hpx::util::unwrapping([this_ = std::move(this_)](
+            hpx::unwrapping([this_ = std::move(this_)](
                               execution_tree::primitive_arguments_type&& args)
                                   -> execution_tree::primitive_argument_type
             {

src/plugins/dist_matrixops/all_gather.cpp

@@ -343,7 +343,7 @@ namespace phylanx { namespace dist_matrixops { namespace primitives
 
         auto this_ = this->shared_from_this();
         return hpx::dataflow(hpx::launch::sync,
-            hpx::util::unwrapping(
+            hpx::unwrapping(
                 [this_ = std::move(this_)](
                     execution_tree::primitive_arguments_type&& args)
                     -> execution_tree::primitive_argument_type

src/plugins/dist_matrixops/dist_constant.cpp

@@ -438,7 +438,7 @@ namespace phylanx { namespace dist_matrixops { namespace primitives
 
         auto ctx_copy = ctx;
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
                 [this_ = std::move(this_), ctx = std::move(ctx_copy)](
                     execution_tree::primitive_arguments_type&& args) mutable
                 -> execution_tree::primitive_argument_type

src/plugins/dist_matrixops/dist_diag.cpp

@@ -438,7 +438,7 @@ namespace phylanx { namespace dist_matrixops { namespace primitives {
 
         auto ctx_copy = ctx;
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_), ctx = std::move(ctx_copy)](
                     execution_tree::primitive_arguments_type&& args) mutable
             -> execution_tree::primitive_argument_type

src/plugins/dist_matrixops/dist_identity.cpp

@@ -223,7 +223,7 @@ namespace phylanx { namespace dist_matrixops { namespace primitives {
 
         auto ctx_copy = ctx;
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_), ctx = std::move(ctx_copy)](
                 execution_tree::primitive_arguments_type&& args) mutable
             -> execution_tree::primitive_argument_type

src/plugins/dist_matrixops/dist_inverse_operation.cpp

@@ -381,7 +381,7 @@ namespace phylanx { namespace dist_matrixops { namespace primitives {
         // Get a future to the result of the actual computation
         auto this_ = this->shared_from_this();
         return hpx::dataflow(hpx::launch::sync,
-            hpx::util::unwrapping(
+            hpx::unwrapping(
                 [this_ = std::move(this_)](primitive_arguments_type&& args)
                     -> primitive_argument_type {
                     return this_->distGaussInv(std::move(args[0]));

src/plugins/dist_matrixops/dist_random.cpp

@@ -272,7 +272,7 @@ namespace phylanx { namespace dist_matrixops { namespace primitives
         }
 
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
                 [this_ = std::move(this_)](
                         execution_tree::primitive_arguments_type&& args)
                 ->  execution_tree::primitive_argument_type

src/plugins/dist_matrixops/dist_transpose_operation.cpp

@@ -520,7 +520,7 @@ namespace phylanx { namespace dist_matrixops { namespace primitives
         }
 
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
             [this_ = std::move(this_)](
                     execution_tree::primitive_arguments_type&& args)
             -> execution_tree::primitive_argument_type

src/plugins/dist_matrixops/retile_annotations.cpp

@@ -1002,7 +1002,7 @@ namespace phylanx { namespace dist_matrixops { namespace primitives
         }
 
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
                 [this_ = std::move(this_)](
                         execution_tree::primitive_arguments_type&& args)
                 ->  execution_tree::primitive_argument_type

src/plugins/fileio/dist_file_read_csv.cpp

@@ -272,7 +272,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
         }
 
         auto this_ = this->shared_from_this();
-        return hpx::dataflow(hpx::launch::sync, hpx::util::unwrapping(
+        return hpx::dataflow(hpx::launch::sync, hpx::unwrapping(
                 [this_ = std::move(this_)](
                     primitive_arguments_type&& args)
                     -> primitive_argument_type