Merge pull request #3089 from DennisHeimbigner/tinyxml.dmh

Step 2 in splitting PR 3068

Author: WardF

RELEASE_NOTES.md

@@ -5,10 +5,10 @@ Release Notes       {#RELEASE_NOTES}
 
 This file contains a high-level description of this package's evolution. Releases are in reverse chronological order (most recent first). Note that, as of netcdf 4.2, the `netcdf-c++` and `netcdf-fortran` libraries have been separated into their own libraries.
 
-## 4.10.0 - TBD
-
 * Step 1 in splitting PR [Github #3068](https://github.com/Unidata/netcdf-c/pull/3068). Update ncjson.[ch] and ncproplist.[ch]. Also fix references to old API. Also fix include/netcdf_ncjson.h and include/netcdf_proplist.h builds. See [Github #3086](https://github.com/Unidata/netcdf-c/pull/3086) for more information.
 * Provide an auxilliary function, `ncaux_parse_provenance()`, that allows users to parse the _NCProperties attribute into a collection of character pointers. See [Github #3088](https://github.com/Unidata/netcdf-c/pull/3088) for more information.
+* Step 2 in splitting PR [Github #3068](https://github.com/Unidata/netcdf-c/pull/3068). Fix a namespace problem in tinyxml2.cpp. Note that this is a visual studio problem hence use of _MSC_VER. Also turn off DAP4 tests against Hyrax server until DAP4 spec problems are fixed. See [Github #3089](https://github.com/Unidata/netcdf-c/pull/3089) for more information.
+
 
 ## 4.9.3 - February 7, 2025
 

dap4_test/CMakeLists.txt

@@ -52,7 +52,7 @@ ENDIF()
 
   IF(NETCDF_ENABLE_DAP_REMOTE_TESTS)
       add_sh_test(dap4_test test_remote)
-      add_sh_test(dap4_test test_hyrax)
+#Suppress until reconciled with hyrax: add_sh_test(dap4_test test_hyrax)
       add_sh_test(dap4_test test_dap4url)
     IF(RUN_MANUAL_TESTS)
         # The following test can only be run by hand.

dap4_test/Makefile.am

@@ -47,7 +47,7 @@ if NETCDF_ENABLE_DAP_REMOTE_TESTS
 
 TESTS += test_remote.sh
 TESTS += test_constraints.sh
-TESTS += test_hyrax.sh
+#Suppress until reconciled with hyrax: TESTS += test_hyrax.sh
 TESTS += test_dap4url.sh
 
 # The following test can only be run by hand.

dap4_test/test_hyrax.sh

@@ -3,6 +3,7 @@
 if test "x$srcdir" = "x"; then srcdir=`dirname $0`; fi
 export srcdir;
 
+
 . ../test_common.sh
 
 . ${srcdir}/d4test_common.sh
@@ -61,7 +62,8 @@ hyraxsplit() {
     PREFIX=`dirname $P`
 }
 
-if test "x${RESET}" = x1 ; then rm -fr ${BASELINEHY}/*.hyrax ; fi
+# Turn on only if regenerating test baseline
+#if test "x${RESET}" = x1 ; then rm -fr ${BASELINEHY}/*.hyrax ; fi
 for f in $F ; do
   hyraxsplit $f
   makehyraxurl

libncxml/ncxml_tinyxml2.cpp

@@ -14,6 +14,10 @@
 
 using namespace tinyxml2;
 
+#ifdef _MSC_VER /*Do not use _WIN32 since this is a visual studio issue */
+#define XMLDocument tinyxml2::XMLDocument
+#endif
+
 static int ncxml_initialized = 0;
 
 void

unit_test/run_reclaim_tests.sh

@@ -13,7 +13,7 @@ sed -e '/^(c)/p' -ed reclaim_tests.txt | sed -e 's/^(c) //' > reclaim_tests_c.tx
 diff reclaim_tests_o.txt reclaim_tests_c.txt
 # Also test using ncdump 
 ${NCDUMP} reclaim_tests.nc > reclaim_tests.dmp
-diff reclaim_tests.dmp ${srcdir}/reclaim_tests.baseline
+diff -b reclaim_tests.dmp ${srcdir}/reclaim_tests.baseline