From dfe4575914e7998e266b3a56c3acee321662ab20 Mon Sep 17 00:00:00 2001
From: Dana Robinson <43805+derobins@users.noreply.github.com>
Date: Thu, 27 May 2021 19:24:30 -0700
Subject: [PATCH] Require a C++11 compiler to build the C++ wrappers (#693)

* Committing clang-format changes

* Requires a C++11 compiler to build the C++ wrappers

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
---
 config/clang-cxxflags                  | 14 +-------------
 config/cmake/HDFCXXCompilerFlags.cmake |  2 +-
 config/gnu-cxxflags                    |  2 +-
 release_docs/RELEASE.txt               |  8 ++++++++
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/config/clang-cxxflags b/config/clang-cxxflags
index e7ab6d8631c..c585ce74171 100644
--- a/config/clang-cxxflags
+++ b/config/clang-cxxflags
@@ -113,19 +113,7 @@ if test "X-clang" = "X-$cxx_vendor" -o "X-Apple LLVM" = "X-$cxx_vendor"; then
             ;;
     esac
 
-    case "$host_os-$host_cpu" in
-        # cygwin needs the "-std=c99" flag removed, so make
-        # a specific case for Cygwin without the flag and a default
-        # case to add the flag everywhere else
-        cygwin-*)
-            ;;
-
-        *)
-            H5_CXXFLAGS="$H5_CXXFLAGS -std=c++11"
-            ;;
-    esac
-
-    H5_CXXFLAGS="$H5_CXXFLAGS $arch"
+    H5_CXXFLAGS="$H5_CXXFLAGS $arch -std=c++11"
 
     ##############
     # Production #
diff --git a/config/cmake/HDFCXXCompilerFlags.cmake b/config/cmake/HDFCXXCompilerFlags.cmake
index 757692c3313..e2904ca0c50 100644
--- a/config/cmake/HDFCXXCompilerFlags.cmake
+++ b/config/cmake/HDFCXXCompilerFlags.cmake
@@ -9,7 +9,7 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-set(CMAKE_CXX_STANDARD 98)
+set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
diff --git a/config/gnu-cxxflags b/config/gnu-cxxflags
index cba8298293e..0a7c63ecf3f 100644
--- a/config/gnu-cxxflags
+++ b/config/gnu-cxxflags
@@ -119,7 +119,7 @@ if test "X-g++" = "X-$cxx_vendor"; then
     esac
 
     # C++-specific
-    H5_CXXFLAGS="$H5_CXXFLAGS $arch"
+    H5_CXXFLAGS="$H5_CXXFLAGS $arch -std=c++11"
 
     ##############
     # Production #
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 578c4b4517f..20d561c68b7 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -49,6 +49,14 @@ New Features
 
     Configuration:
     -------------
+    - A C++11-compliant compiler is now required to build the C++ wrappers
+
+      CMAKE_CXX_STANDARD is now set to 11 when building with CMake and 
+      -std=c++11 is added when building with clang/gcc via the Autotools.
+
+      (DER - 2021/05/27)
+
+
     - CMake will now run the shell script tests in test/ by default
 
       The test directory includes several shell script tests that previously