8e30bc8
From 5ffbb5fdcce82b8ba19efd9cc6a7bfcc0b62ba15 Mon Sep 17 00:00:00 2001
8e30bc8
From: John Biddiscombe <biddisco@cscs.ch>
8e30bc8
Date: Thu, 15 Nov 2018 11:49:21 +0100
8e30bc8
Subject: [PATCH] Fix uint64_t causing compilation fail on i686
8e30bc8
8e30bc8
use std:: for all uint16_t and uint64_t throughout
8e30bc8
---
8e30bc8
 .../async_customization.cpp                   | 22 +++++++++----------
8e30bc8
 1 file changed, 11 insertions(+), 11 deletions(-)
8e30bc8
8e30bc8
diff --git a/examples/resource_partitioner/async_customization.cpp b/examples/resource_partitioner/async_customization.cpp
8e30bc8
index 16aca83b5a5..e6c6a61e004 100644
8e30bc8
--- a/examples/resource_partitioner/async_customization.cpp
8e30bc8
+++ b/examples/resource_partitioner/async_customization.cpp
8e30bc8
@@ -29,7 +29,7 @@
8e30bc8
 #include "shared_priority_queue_scheduler.hpp"
8e30bc8
 //
8e30bc8
 #include <cstddef>
8e30bc8
-#include <cstddef>
8e30bc8
+#include <cstdint>
8e30bc8
 #include <iostream>
8e30bc8
 #include <memory>
8e30bc8
 #include <string>
8e30bc8
@@ -382,11 +382,11 @@ int test(Executor &exec)
8e30bc8
     // test 3b
8e30bc8
     std::cout << "============================" << std::endl;
8e30bc8
     std::cout << "Test 3b : when_all(shared)" << std::endl;
8e30bc8
-    future<uint64_t>     fws1 = make_ready_future(uint64_t(42));
8e30bc8
+    future<std::uint64_t>     fws1 = make_ready_future(std::uint64_t(42));
8e30bc8
     shared_future<float> fws2 = make_ready_future(3.1415f).share();
8e30bc8
     //
8e30bc8
     auto fws = when_all(fws1, fws2).then(exec,
8e30bc8
-        [](future<util::tuple<future<uint64_t>, shared_future<float>>> && f)
8e30bc8
+        [](future<util::tuple<future<std::uint64_t>, shared_future<float>>> && f)
8e30bc8
         {
8e30bc8
             auto tup = f.get();
8e30bc8
             auto cmplx = std::complex<double>(
8e30bc8
@@ -401,13 +401,13 @@ int test(Executor &exec)
8e30bc8
     // test 4a
8e30bc8
     std::cout << "============================" << std::endl;
8e30bc8
     std::cout << "Test 4a : dataflow()" << std::endl;
8e30bc8
-    future<uint16_t> f1 = make_ready_future(uint16_t(255));
8e30bc8
+    future<std::uint16_t> f1 = make_ready_future(std::uint16_t(255));
8e30bc8
     future<double>   f2 = make_ready_future(127.890);
8e30bc8
     //
8e30bc8
     auto fd = dataflow(exec,
8e30bc8
-        [](future<uint16_t> && f1, future<double> && f2)
8e30bc8
+        [](future<std::uint16_t> && f1, future<double> && f2)
8e30bc8
         {
8e30bc8
-            auto cmplx = std::complex<uint64_t>(f1.get(), f2.get());
8e30bc8
+            auto cmplx = std::complex<std::uint64_t>(f1.get(), f2.get());
8e30bc8
             std::cout << "Inside dataflow : " << cmplx << std::endl;
8e30bc8
             return cmplx;
8e30bc8
         }
8e30bc8
@@ -419,13 +419,13 @@ int test(Executor &exec)
8e30bc8
     // test 4b
8e30bc8
     std::cout << "============================" << std::endl;
8e30bc8
     std::cout << "Test 4b : dataflow(shared)" << std::endl;
8e30bc8
-    future<uint16_t>      fs1 = make_ready_future(uint16_t(255));
8e30bc8
+    future<std::uint16_t>      fs1 = make_ready_future(std::uint16_t(255));
8e30bc8
     shared_future<double> fs2 = make_ready_future(127.890).share();
8e30bc8
     //
8e30bc8
     auto fds = dataflow(exec,
8e30bc8
-        [](future<uint16_t> && f1, shared_future<double> && f2)
8e30bc8
+        [](future<std::uint16_t> && f1, shared_future<double> && f2)
8e30bc8
         {
8e30bc8
-            auto cmplx = std::complex<uint64_t>(f1.get(), f2.get());
8e30bc8
+            auto cmplx = std::complex<std::uint64_t>(f1.get(), f2.get());
8e30bc8
             std::cout << "Inside dataflow(shared) : " << cmplx << std::endl;
8e30bc8
             return cmplx;
8e30bc8
         }
8e30bc8
@@ -453,14 +453,14 @@ namespace hpx { namespace threads { namespace executors
8e30bc8
           std::cout << "Hint 2 \n";
8e30bc8
           return 0;
8e30bc8
       }
8e30bc8
-      int operator()(const uint16_t, const double) const {
8e30bc8
+      int operator()(const std::uint16_t, const double) const {
8e30bc8
           std::cout << "Hint 3 \n";
8e30bc8
           return 0;
8e30bc8
       }
8e30bc8
       int operator()(const util::tuple<future<int>, future<double>> &) const {
8e30bc8
           return 0;
8e30bc8
       }
8e30bc8
-      int operator()(const util::tuple<future<long unsigned int>,
8e30bc8
+      int operator()(const util::tuple<future<std::uint64_t>,
8e30bc8
                      shared_future<float>> &) const
8e30bc8
       {
8e30bc8
           return 0;