support C++17

willamowius · Nov 22, 2023 · 8772876 · Lastique · Mar 8, 2024 · 8772876
1 parent cda1d9f
commit 8772876
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/include/ptlib/pprocess.h b/include/ptlib/pprocess.h
@@ -192,13 +192,23 @@ class PTimerList : public PObject
       PAtomicInteger::IntegerType m_serialNumber;
     };
 
-      // TODO the use of binary_function needs a patch for C++17
+#if (__cplusplus >= 201703L)
+	  struct TimerExpiryInfo_compare
+	  {
+		typedef TimerExpiryInfo first_argument_type;
+        typedef TimerExpiryInfo second_argument_type;
+        typedef bool result_type;
+	    bool operator()(const TimerExpiryInfo & _Left, const TimerExpiryInfo & _Right) const
+		  {	return (_Left.m_expireTime < _Right.m_expireTime); }
+	  };
+#else
 	  struct TimerExpiryInfo_compare
 		  : public binary_function<TimerExpiryInfo, TimerExpiryInfo, bool>
 	  {	
 	    bool operator()(const TimerExpiryInfo & _Left, const TimerExpiryInfo & _Right) const
 		  {	return (_Left.m_expireTime < _Right.m_expireTime); }
 	  };
+#endif
 
     typedef std::multiset<TimerExpiryInfo, TimerExpiryInfo_compare> TimerExpiryInfoList;
     TimerExpiryInfoList m_expiryList;

diff --git a/include/ptlib/psharedptr.h b/include/ptlib/psharedptr.h
@@ -60,9 +60,13 @@ class PSharedPtr : public PContainer
       : PContainer(c)
     { CopyContents(c); } 
 
+#if (__cplusplus >= 201703L)
+    PSharedPtr(std::unique_ptr<element_type> & v)
+    { ptr = v.release(); }
+#else
     PSharedPtr(std::auto_ptr<element_type> & v)
     { ptr = v.release(); }
-
+#endif
     PSharedPtr & operator=(const PSharedPtr & c) 
     { AssignContents(c); return *this; } 
 

diff --git a/make/unix.mak b/make/unix.mak
@@ -115,7 +115,6 @@ ifeq ($(USE_GCC),yes)
 # avoid warning from clang
 ifeq ($(USE_CLANG),"1")
 STDCCFLAGS += -Wno-deprecated-declarations -Wno-unused-result -Wno-unused-variable -Wno-unknown-pragmas -Wno-unused-private-field -Wno-overloaded-virtual
-CXX += -std=c++14
 else
 # avoid warnings from gcc >= 5 / gcc >= 10
 ifeq "$(GCCMAJORGTEQ5)" "1"

diff --git a/src/ptlib/common/object.cxx b/src/ptlib/common/object.cxx
@@ -949,10 +949,8 @@ void PMemoryHeap::SetAllocationBreakpoint(DWORD objectNumber)
 
 #if !defined(P_VXWORKS) && !defined(_WIN32_WCE)
 
-#if (__cplusplus >= 201703L)
-// C++17
-//_GLIBCXX_NODISCARD void* operator new[](std::size_t nSize) _GLIBCXX_THROW (std::bad_alloc)
-void* operator new[](std::size_t nSize) _GLIBCXX_THROW (std::bad_alloc)
+#if (__cplusplus >= 201703L) // C++17
+void* operator new[](std::size_t nSize, std::align_val_t al) noexcept(false)
 #else
 #if (__GNUC__ >= 3) || ((__GNUC__ == 2)&&(__GNUC_MINOR__ >= 95)) //2.95.X & 3.X
 void * operator new[](size_t nSize) throw ()