fix compile for c++17

Author: lihuiba

.github/workflows/ci.macos.arm.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Build
         run: |
           cmake -B ${{github.workspace}}/build -D PHOTON_BUILD_TESTING=ON -D CMAKE_BUILD_TYPE=Release \
-            -D PHOTON_ENABLE_SASL=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@3
+            -D PHOTON_ENABLE_SASL=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@3 -D PHOTON_CXX_STANDARD=17
           cmake --build ${{github.workspace}}/build -j $(nproc)
 
       - name: Test

.github/workflows/ci.macos.x86.yml

@@ -27,7 +27,7 @@ jobs:
     - name: Build
       run: |
         cmake -B ${{github.workspace}}/build -D PHOTON_BUILD_TESTING=ON -D CMAKE_BUILD_TYPE=Release \
-          -D PHOTON_ENABLE_SASL=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@3
+          -D PHOTON_ENABLE_SASL=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@3 -D PHOTON_CXX_STANDARD=17
         cmake --build ${{github.workspace}}/build -j $(nproc)
 
     - name: Test

common/enumerable.h

@@ -41,7 +41,11 @@ struct Enumerable
           if (obj && !obj->valid())
             this->obj = nullptr;
         }
+#if __cplusplus < 201703L
         using R = typename std::result_of<decltype(&T::get)(T)>::type;
+#else
+        using R = typename std::invoke_result<decltype(&T::get), T>::type;
+#endif
         R operator*() { return obj ? obj->get() : R{}; }
         bool operator==(const iterator& rhs) const { return obj == rhs.obj; }
         bool operator!=(const iterator& rhs) const { return !(*this == rhs); }

common/executor/executor.h

@@ -33,7 +33,11 @@ class Executor {
 
     template <
         typename Context = AutoContext, typename Func,
+#if __cplusplus < 201703L
         typename R = typename std::result_of<Func()>::type,
+#else
+        typename R = typename std::invoke_result<Func>::type,
+#endif
         typename _ = typename std::enable_if<!std::is_void<R>::value, R>::type>
     R perform(Func &&act) {
         R result;
@@ -52,7 +56,11 @@ class Executor {
 
     template <
         typename Context = AutoContext, typename Func,
+#if __cplusplus < 201703L
         typename R = typename std::result_of<Func()>::type,
+#else
+        typename R = typename std::invoke_result<Func>::type,
+#endif
         typename _ = typename std::enable_if<std::is_void<R>::value, R>::type>
     void perform(Func &&act) {
         Awaiter<Context> aop;

common/ring.cpp

@@ -60,7 +60,7 @@ ssize_t RingBuffer::do_read(void *buf, size_t count)
 ssize_t RingBuffer::readv(const struct iovec *iov, int iovcnt)
 {
     ssize_t size = 0;
-    scoped_lock lock(m_read_lock);
+    photon::scoped_lock lock(m_read_lock);
     for (auto& x: ptr_array(iov, iovcnt))
     {
         auto ret = do_read(x.iov_base, x.iov_len);
@@ -110,7 +110,7 @@ ssize_t RingBuffer::do_write(const void* buf, size_t count)
 ssize_t RingBuffer::writev(const struct iovec *iov, int iovcnt)
 {
     ssize_t size = 0;
-    scoped_lock lock(m_write_lock);
+    photon::scoped_lock lock(m_write_lock);
     for (auto& x: ptr_array(iov, iovcnt))
     {
         auto ret = do_write(x.iov_base, x.iov_len);

fs/async_filesystem.cpp

@@ -85,7 +85,11 @@ namespace fs
     {
     public:
         template<typename IF, typename Func, typename...ARGS,
+#if __cplusplus < 201703L
             typename R = typename std::result_of<Func(IF*, ARGS...)>::type >
+#else
+            typename R = typename std::invoke_result<Func, IF*, ARGS...>::type>
+#endif
         R perform(IF* _if, Func func, ARGS...args)
         {
             return th_performer<R>().call(_if, func, args...);

rpc/test/test-ooo.cpp

@@ -20,7 +20,7 @@ limitations under the License.
 #include <thread>
 #include <algorithm>
 
-#include <gtest/gtest.h>
+#include "../../test/gtest.h"
 #include <gflags/gflags.h>
 #include <photon/common/alog.h>
 
@@ -58,7 +58,7 @@ int do_issue(void*, OutOfOrderContext* args)
     auto tag = args->tag;
     LOG_DEBUG(VALUE(tag));
     aop.push_back(args->tag);
-    random_shuffle(aop.begin(), aop.end());
+    shuffle(aop.begin(), aop.end());
     return 0;
 }
 
@@ -121,7 +121,7 @@ int heavy_complete(void*, OutOfOrderContext* args) {
 int process_thread() {
     while (issue_list.size()) {
         thread_yield();
-        random_shuffle(issue_list.begin(), issue_list.end());
+        shuffle(issue_list.begin(), issue_list.end());
         processing_queue.push(issue_list.back());
         issue_list.pop_back();
     }
@@ -207,7 +207,7 @@ inline int error_complete(void*, OutOfOrderContext* args) {
 inline int error_process() {
     while (issue_list.size()) {
         thread_yield_to(nullptr);
-        random_shuffle(issue_list.begin(), issue_list.end());
+        shuffle(issue_list.begin(), issue_list.end());
         auto val = issue_list.back();
         if (rand()%2)
             val = UINT64_MAX;

test/gtest.h

@@ -0,0 +1,20 @@
+#pragma once
+#include <random>
+#include <algorithm>
+
+// #pragma GCC diagnostic push
+// #ifdef __clang__
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#pragma GCC diagnostic ignored "-Wunused-result"
+
+// #endif
+#include <gtest/gtest.h>
+#include <gtest/gtest-spi.h>
+// #pragma GCC diagnostic pop
+
+template< class RandomIt> inline
+void shuffle( RandomIt first, RandomIt last) {
+    std::random_device rd;
+    std::mt19937 g(rd());
+    return std::shuffle(first, last, g);
+}

thread/test/test.cpp

@@ -23,7 +23,7 @@ limitations under the License.
 #include <algorithm>
 #include <sys/time.h>
 #include <gflags/gflags.h>
-#include <gtest/gtest.h>
+#include "../../test/gtest.h"
 #include <photon/common/alog-audit.h>
 
 #define private public
@@ -140,7 +140,7 @@ void sleepq_perf(SleepQueue& sleepq, const vector<photon::thread*>& items)
     check(sleepq);
 
     auto pops = items;
-    random_shuffle(pops.begin(), pops.end());
+    shuffle(pops.begin(), pops.end());
     pops.resize(pops.size()/2);
     {
         update_now();