MDEV-35837 Move to c++17

Move from c++11 to c++17.

CMakeLists.txt

@@ -78,15 +78,9 @@ ENDIF()
 # This is used by TokuDB only
 SET(MYSQL_PROJECT_NAME_DOCSTRING "MySQL project name")
 
-IF(CMAKE_VERSION VERSION_LESS "3.1")
-  IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-  ENDIF()
-ELSE()
-  SET(CMAKE_C_STANDARD 99)
-  SET(CMAKE_CXX_STANDARD 11)
-ENDIF()
+# C and C++ standards (e.g. -std=c++17)
+SET(CMAKE_C_STANDARD 99)
+SET(CMAKE_CXX_STANDARD 17)
 
 # Lower case package names from PROJECT are used if not explictly upper case.
 SET(CPACK_PACKAGE_NAME "MariaDB")

cmake/cpack_rpm.cmake

@@ -5,7 +5,6 @@ MESSAGE(STATUS "CPackRPM building with RPM configuration: ${RPM}")
 SET(CPACK_GENERATOR "RPM")
 SET(CPACK_RPM_PACKAGE_DEBUG 1)
 SET(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)
 
 SET(CPACK_RPM_COMPONENT_INSTALL ON)
 

plugin/handler_socket/handlersocket/database.cpp

@@ -175,7 +175,7 @@ struct dbcontext : public dbcontext_i, private noncopyable {
   THD *thd;
   MYSQL_LOCK *lock;
   bool lock_failed;
-  std::auto_ptr<expr_user_lock> user_lock;
+  std::unique_ptr<expr_user_lock> user_lock;
   int user_level_lock_timeout;
   bool user_level_lock_locked;
   bool commit_error;

plugin/handler_socket/handlersocket/database.hpp

@@ -9,11 +9,6 @@
 #ifndef DENA_DATABASE_HPP
 #define DENA_DATABASE_HPP
 
-#ifdef __GNUC__
-/* auto_ptr is deprecated */
-# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
 #include <string>
 #include <memory>
 #include <vector>
@@ -26,10 +21,10 @@
 namespace dena {
 
 struct database_i;
-typedef std::auto_ptr<volatile database_i> database_ptr;
+typedef std::unique_ptr<volatile database_i> database_ptr;
 
 struct dbcontext_i;
-typedef std::auto_ptr<dbcontext_i> dbcontext_ptr;
+typedef std::unique_ptr<dbcontext_i> dbcontext_ptr;
 
 struct database_i {
   virtual ~database_i() = default;

plugin/handler_socket/handlersocket/handlersocket.cpp

@@ -76,7 +76,7 @@ daemon_handlersocket_init(void *p)
   conf["readsize"] = to_stdstring(handlersocket_readsize);
   conf["accept_balance"] = to_stdstring(handlersocket_accept_balance);
   conf["wrlock_timeout"] = to_stdstring(handlersocket_wrlock_timeout);
-  std::auto_ptr<daemon_handlersocket_data> ap(new daemon_handlersocket_data);
+  std::unique_ptr<daemon_handlersocket_data> ap(new daemon_handlersocket_data);
   if (handlersocket_port != 0 && handlersocket_port_wr != handlersocket_port) {
     conf["port"] = handlersocket_port;
     if (handlersocket_plain_secret) {

plugin/handler_socket/handlersocket/hstcpsvr.cpp

@@ -115,7 +115,7 @@ hstcpsvr::start_listen()
     arg.cshared = &cshared;
     arg.vshared = &vshared;
     arg.worker_id = i;
-    std::auto_ptr< thread<worker_throbj> > thr(
+    std::unique_ptr< thread<worker_throbj> > thr(
       new thread<worker_throbj>(arg, stack_size));
     threads.push_back_ptr(thr);
   }

plugin/handler_socket/handlersocket/hstcpsvr.hpp

@@ -44,7 +44,7 @@ struct hstcpsvr_shared_v : public mutex {
 };
 
 struct hstcpsvr_i;
-typedef std::auto_ptr<hstcpsvr_i> hstcpsvr_ptr;
+typedef std::unique_ptr<hstcpsvr_i> hstcpsvr_ptr;
 
 struct hstcpsvr_i {
   virtual ~hstcpsvr_i() = default;

plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp

@@ -451,7 +451,7 @@ hstcpsvr_worker::run_one_nb()
   {
     pollfd& pfd = pfds[nfds - 1];
     if ((pfd.revents & mask_in) != 0) {
-      std::auto_ptr<hstcpsvr_conn> c(new hstcpsvr_conn());
+      std::unique_ptr<hstcpsvr_conn> c(new hstcpsvr_conn());
       c->nonblocking = true;
       c->readsize = cshared.readsize;
       c->accept(cshared);
@@ -498,7 +498,7 @@ hstcpsvr_worker::run_one_ep()
       /* listener */
       ++accept_count;
       DBG_EP(fprintf(stderr, "IN listener\n"));
-      std::auto_ptr<hstcpsvr_conn> c(new hstcpsvr_conn());
+      std::unique_ptr<hstcpsvr_conn> c(new hstcpsvr_conn());
       c->nonblocking = true;
       c->readsize = cshared.readsize;
       c->accept(cshared);

plugin/handler_socket/handlersocket/hstcpsvr_worker.hpp

@@ -14,7 +14,7 @@
 namespace dena {
 
 struct hstcpsvr_worker_i;
-typedef std::auto_ptr<hstcpsvr_worker_i> hstcpsvr_worker_ptr;
+typedef std::unique_ptr<hstcpsvr_worker_i> hstcpsvr_worker_ptr;
 
 struct hstcpsvr_worker_arg {
   const hstcpsvr_shared_c *cshared;

plugin/handler_socket/libhsclient/hstcpcli.hpp

@@ -19,11 +19,6 @@
 #include "string_ref.hpp"
 #include "string_buffer.hpp"
 
-#ifdef __GNUC__
-/* auto_ptr is deprecated */
-# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
 namespace dena {
 
 struct hstcpcli_filter {
@@ -35,7 +30,7 @@ struct hstcpcli_filter {
 };
 
 struct hstcpcli_i;
-typedef std::auto_ptr<hstcpcli_i> hstcpcli_ptr;
+typedef std::unique_ptr<hstcpcli_i> hstcpcli_ptr;
 
 struct hstcpcli_i {
   virtual ~hstcpcli_i() = default;

storage/mroonga/CMakeLists.txt

@@ -17,7 +17,6 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA
 
-cmake_minimum_required(VERSION 2.8.12)
 project(mroonga)
 
 if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")

storage/mroonga/vendor/groonga/CMakeLists.txt

@@ -13,10 +13,6 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA
 
-# https://buildbot.askmonty.org/buildbot/builders/work-amd64-valgrind/builds/5263/steps/compile/logs/stdio
-# says CMake 2.6.2... We want to drop old software support...
-cmake_minimum_required(VERSION 2.8.12)
-# cmake_minimum_required(VERSION 2.6.4) # CentOS 5
 set(GRN_PROJECT_NAME "groonga")
 set(GRN_PROJECT_LABEL "Groonga")
 project("${GRN_PROJECT_NAME}")

storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt

@@ -15,7 +15,6 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 # MA 02110-1335  USA
 
-cmake_minimum_required(VERSION 2.8.12)
 if(NOT DEFINED GROONGA_NORMALIZER_MYSQL_PROJECT_NAME)
     set(GROONGA_NORMALIZER_MYSQL_PROJECT_NAME "groonga-normalizer-mysql")
 endif()