xrootd4/trunk/cxx17.patch

   1 diff --git a/bindings/python/setup.py.in b/bindings/python/setup.py.in
   2 index 74fbe36a6..6bedbead8 100644
   3 --- a/bindings/python/setup.py.in
   4 +++ b/bindings/python/setup.py.in
   5 @@ -8,15 +8,15 @@
   6  # Remove the "-Wstrict-prototypes" compiler option, which isn't valid for C++.
   7  cfg_vars = sysconfig.get_config_vars()
   8  opt = cfg_vars["OPT"]
   9 -cfg_vars["OPT"] = " ".join( flag for flag in opt.split() if flag not in ['-Wstrict-prototypes' ${CLANG_PROHIBITED} ] ) + " --std=c++0x"
  10 +cfg_vars["OPT"] = " ".join( flag for flag in opt.split() if flag not in ['-Wstrict-prototypes' ${CLANG_PROHIBITED} ] ) + " --std=c++17"
  11
  12  cflags = cfg_vars["CFLAGS"]
  13 -cfg_vars["CFLAGS"] =  " ".join( flag for flag in cflags.split() if flag not in ['-Wstrict-prototypes' ${CLANG_PROHIBITED} ] ) + " --std=c++0x"
  14 +cfg_vars["CFLAGS"] =  " ".join( flag for flag in cflags.split() if flag not in ['-Wstrict-prototypes' ${CLANG_PROHIBITED} ] ) + " --std=c++17"
  15
  16  # pypy doesn't define PY_CFLAGS so skip it if it's missing
  17  if "PY_CFLAGS" in cfg_vars:
  18    py_cflags = cfg_vars["PY_CFLAGS"]
  19 -  cfg_vars["PY_CFLAGS"] = " ".join( flag for flag in py_cflags.split() if flag not in ['-Wstrict-prototypes' ${CLANG_PROHIBITED} ] ) + " --std=c++0x"
  20 +  cfg_vars["PY_CFLAGS"] = " ".join( flag for flag in py_cflags.split() if flag not in ['-Wstrict-prototypes' ${CLANG_PROHIBITED} ] ) + " --std=c++17"
  21
  22  ccl=cfg_vars["CC"].split()
  23  ccl[0]="${CMAKE_C_COMPILER}"
  24 diff --git a/cmake/XRootDOSDefs.cmake b/cmake/XRootDOSDefs.cmake
  25 index 4933fd13f..20d8c524b 100644
  26 --- a/cmake/XRootDOSDefs.cmake
  27 +++ b/cmake/XRootDOSDefs.cmake
  28 @@ -21,13 +21,13 @@ add_definitions( -DUSE_LIBC_SEMAPHORE=${USE_LIBC_SEMAPHORE} )
  29  #-------------------------------------------------------------------------------
  30  # Enable c++0x / c++11
  31  #-------------------------------------------------------------------------------
  32 -set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -DOPENSSL_NO_FILENAMES" )
  33 +set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -DOPENSSL_NO_FILENAMES" )
  34
  35  #-------------------------------------------------------------------------------
  36  # GCC
  37  #-------------------------------------------------------------------------------
  38  if( CMAKE_COMPILER_IS_GNUCXX )
  39 -  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x" )
  40 +  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17" )
  41    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra" )
  42    #-----------------------------------------------------------------------------
  43    # Set -Werror only for Debug (or undefined) build type or if we have been
  44 diff --git a/src/XrdSsi/XrdSsiAtomics.hh b/src/XrdSsi/XrdSsiAtomics.hh
  45 index ffe0a938e..ce23083e7 100644
  46 --- a/src/XrdSsi/XrdSsiAtomics.hh
  47 +++ b/src/XrdSsi/XrdSsiAtomics.hh
  48 @@ -34,7 +34,7 @@
  49  #undef NEED_ATOMIC_MUTEX
  50
  51  //-----------------------------------------------------------------------------
  52 -//! Use native atomics at the c11 or higher level (-std=c++0x -lstdc++)
  53 +//! Use native atomics at the c11 or higher level (-std=c++17 -lstdc++)
  54  //-----------------------------------------------------------------------------
  55  #if __cplusplus >= 201103L
  56  #include <atomic>