Merge from develop

2018-07-31 10:07:00 -05:00
parent 23b96a8dc8
commit 4f5bdadd50
12 changed files with 89 additions and 60 deletions
--- a/config/cmake_ext_mod/HDFUseCXX.cmake
+++ b/config/cmake_ext_mod/HDFUseCXX.cmake
@@ -98,11 +98,11 @@ endmacro ()
 if (CMAKE_CXX_COMPILER_LOADED)
  foreach (test
      OLD_HEADER_FILENAME
-      ${HDF_PREFIX}_NO_NAMESPACE
-      ${HDF_PREFIX}_NO_STD
+      HDF_NO_NAMESPACE
+      HDF_NO_STD
      BOOL_NOTDEFINED
      NO_STATIC_CAST
-      ${HDF_PREFIX}_CXX_HAVE_OFFSETOF
+      CXX_HAVE_OFFSETOF
  )
    HDF_CXX_FUNCTION_TEST (${test})
  endforeach ()