Isolate code depending on v2 API #656
Conversation
There are two code segments using the v2 API. One was protected by `NO_NETCDF_2` ifdef, but that isn't defined in the CMake build. Better to use the `NC_HAS_NC2` define which is in `netcdf_meta.h` The second code segment was not protected by any ifdef.
I assumed netcdf.h included netcdf_meta.h, but now see that it doesn't and an explicit include is required.
|
NOTE: Another fix would be to add the NO_NETCDF_2 define to the CMakeLists.txt file in this directory and change the |
|
config.h is the canonical location for information about what features of the build are turned on and off. It is already included in this test (as it must be) by nc_tests.h. So I would strongly suggest that netcdf_meta.h not be included, and that the CMake build should be changed to also define NC_NETCDF_2, or else the configure.ac and config.h.in (and other C code) be changed to use NC_HAS_NC2 everywhere instead of NC_NETCDF_2. But whatever is used, it should come from config.h. |
|
This PR should not be merged and can be taken down. I have applied the V2 fix using config.h on my current branch, currently up as PR #755. |
|
@gsjaardema or @WardF can you please close this PR? The fix for the V2 test code (using config.h) is part of the ejh_test_fills branch that I will be merging after the current PR backlog has been cleared. So this PR is no longer needed. |
Remove test code that uses the version 2 API if the version 2 API code is not being activated in the build. This was originally proposed in Unidata#656 with a better fix in Unidata#755 which was removed.
There are two code segments using the v2 API. One was protected by
NO_NETCDF_2ifdef, but that isn't defined in the CMake build. Better to use theNC_HAS_NC2define which is innetcdf_meta.hThe second code segment was not protected by any ifdef.