Commit Graph

4754 Commits

Author SHA1 Message Date
Ward Fisher
8e169175e4
Merge branch 'master' into newhash0.dmh 2018-02-22 14:55:31 -07:00
Ward Fisher
a242afe77c
Merge pull request #860 from NetCDF-World-Domination-Council/ejh_extra_tests
Some extra attribute and rename testing that I neglected to include in previous PRs
2018-02-22 14:48:20 -07:00
Ward Fisher
f9f27c5ab7
Merge branch 'master' into newhash0.dmh 2018-02-21 14:19:43 -07:00
Ed Hartnett
9de58cad99
Merge branch 'master' into ejh_extra_tests 2018-02-19 18:52:50 -07:00
Ward Fisher
db41b2a653
Merge pull request #868 from Unidata/gh849.wif
Pull #849 plus a note in the release notes.
2018-02-16 14:30:14 -07:00
Ward Fisher
a3ea416eb5 Updated release notes in reference to https://github.com/Unidata/netcdf-c/pull/849 2018-02-16 13:05:45 -07:00
Ward Fisher
40805e5dfa
Merge branch 'master' into ejh_hdf4_dispatch_unidata2 2018-02-16 13:02:05 -07:00
Ward Fisher
3f035d9d7a
Merge pull request #814 from mathstuf/minor-cleanups
Minor cleanups
2018-02-16 13:01:30 -07:00
Ed Hartnett
ca5f314fc0 minor test cleanup 2018-02-16 09:00:15 -07:00
Ed Hartnett
13fcc67d90
Merge branch 'master' into ejh_hdf4_dispatch_unidata2 2018-02-15 13:25:11 -07:00
Ben Boeckel
bdae9b4c44 nc4hdf: use PRId64 for hid_t format strings 2018-02-14 17:24:49 -05:00
Ben Boeckel
b432a527c4 c: remove __CHAR_UNSIGNED__
In C, `char`, `signed char`, and `unsigned char` are three separate,
distinct types, so just because `char` happens to be signed does not
mean it is interchangeable with `signed char`.
2018-02-14 17:24:49 -05:00
Ben Boeckel
7505bed6f5 nc4dispatch: don't initialize fields which may not exist
These fields are only here if `USE_NETCDF4` is defined.
2018-02-14 17:24:49 -05:00
Ben Boeckel
a7057925d6 configure: remove unused configure checks
These checks all control variables which are unused within the codebase.
2018-02-14 17:24:45 -05:00
Ben Boeckel
2c14d52c46 cmake: include modules by name
This allows for toolchains to override these modules.
2018-02-14 17:23:21 -05:00
Ed Hartnett
b0a8d4ee30 fixed merge issue 2018-02-14 07:58:50 -07:00
Ed Hartnett
41eb0f26c1
Merge branch 'master' into ejh_extra_tests 2018-02-13 15:48:35 -07:00
Ward Fisher
8ebb2fff8b
Merge pull request #862 from Unidata/gh861.wif
Corrected overflow error in support of https://github.com/Unidata/net
2018-02-13 15:22:45 -07:00
Ed Hartnett
e5cbf259ba fixed string memory leak 2018-02-13 14:17:15 -07:00
Ed Hartnett
cb4722a0cf fix for memory problem in tst_vars2.c 2018-02-13 13:49:29 -07:00
Ward Fisher
878b107d36 Corrected overflow error in support of https://github.com/Unidata/netcdf-c/issues/861 2018-02-13 12:18:06 -07:00
Ed Hartnett
dd41680f90 added rename test 2018-02-12 10:13:31 -07:00
Ed Hartnett
dbbd5094cb added rename test to CMakeLists.txt 2018-02-12 10:12:49 -07:00
Ed Hartnett
32e2798dde added rename test 2018-02-12 10:08:59 -07:00
Ed Hartnett
70d815b6c8 pulled in some attribute testing that got missed in recent merges 2018-02-12 08:33:20 -07:00
Ed Hartnett
462a4db918 merged upstream/master 2018-02-12 08:09:39 -07:00
Ward Fisher
30163bcd34 Fix syntax for NC_EXTRA_DEPS 2018-02-09 12:57:11 -07:00
Ward Fisher
d9e9e2bf52
Merge branch 'master' into newhash0.dmh 2018-02-09 11:46:18 -07:00
Ward Fisher
f3e44e3206
Merge pull request #854 from Unidata/cmake-hdf5-crt.wif
HDF5 ZLIB detection and CRT configuration
2018-02-09 11:44:11 -07:00
Ed Hartnett
392a12a7c2 attempting fix for cmake HDF4 build problem when netcdf-4 is not built 2018-02-09 08:26:58 -07:00
Ed Hartnett
2cbb4f6b64 attempting fix for cmake HDF4 build problem when netcdf-4 is not built 2018-02-09 07:44:40 -07:00
Dennis Heimbigner
727b613459 This is the initial step in moving to the new higher performance
(I hope) metadata mechanism. This mostly just adds new pieces of
code (e.g. nclistmap) and does some minor fixes.

It should be transparent to everything else.
The next set of changes will be the big step.
2018-02-08 19:53:40 -07:00
Ward Fisher
b20bc97a3c Updated release notes in support of https://github.com/Unidata/netcdf-c/pull/853 2018-02-08 12:55:45 -07:00
pedro-vicente
23b5e5bd8d changes to detect HDF5 HL, build with CRT and detect ZLIB in HDF5 2018-02-08 13:45:29 -05:00
Ed Hartnett
111cef3891 disable HDF4 if netCDF-4 is not enabled 2018-02-08 11:35:27 -07:00
Ed Hartnett
723cc840a3 added missing file 2018-02-08 08:02:28 -07:00
Ed Hartnett
bd77f8865b fixed tst_filter.sh for parallel builds 2018-02-08 07:20:40 -07:00
Ed Hartnett
5f779db7c1 added HDF4 dir to cmake build file 2018-02-08 07:17:36 -07:00
Ed Hartnett
2358d4a910 moved HDF4 to its own dispatch layer 2018-02-08 06:20:58 -07:00
Ed Hartnett
3ff753c147 merged upstream/master 2018-02-08 04:14:20 -07:00
Ward Fisher
712b13e396
Merge pull request #846 from Unidata/windows_mem_nc3.wif
Address a Windows NC3 Memory issue.
2018-02-07 14:51:47 -07:00
Ward Fisher
9e926410ee Added the fix suggested by @mathstuf in support of https://github.com/unidata/netcdf-c/issues/845 2018-02-07 11:23:54 -07:00
Ward Fisher
f9b7f1d452
Merge pull request #844 from Unidata/ejh_batch.wif
Batch EJH Pull requests
2018-02-07 11:15:38 -07:00
Ward Fisher
5107655682 Accomodate Visual Studio 2018-02-06 13:32:30 -06:00
Ward Fisher
39465fed12 Added include to config.h 2018-02-06 13:14:15 -06:00
Ward Fisher
a640c034f2 Merge branch 'ejh_atts_unidata' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into ejh_batch 2018-02-05 11:47:48 -07:00
Ward Fisher
e0577cb251 Merge branch 'ejh_fill_value_string_unidata' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into ejh_batch 2018-02-05 11:47:34 -07:00
Ward Fisher
9276fdaf9a Merge branch 'ejh_var_docs_only_unidata_2' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into ejh_batch 2018-02-05 11:43:52 -07:00
Ward Fisher
b268f268bd Merge branch 'ejh_dims_unidata' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into ejh_batch 2018-02-05 11:43:41 -07:00
Ed Hartnett
91fb82c6c5 merged changes from upstream/master 2018-02-05 09:23:54 -07:00