Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Git Cleanup, Fix for #1486 #1495

Merged
merged 4 commits into from
Oct 11, 2019
+8 −8
Merged

Git Cleanup, Fix for #1486 #1495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cca0f8d
Moved code of conduct and contributing to .github folder.
WardF Oct 8, 2019
d001ec8
Removing a problematic const causing issues on OSX.
WardF Oct 9, 2019
9b4a930
Restoring CMake compilation document.
WardF Oct 10, 2019
568c106
Updated release notes to reference https://github.com/Unidata/netcdf-…
WardF Oct 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 CODE_OF_CONDUCT.md → .github/CODE_OF_CONDUCT.md
View file
Open in desktop
File renamed without changes.
0 CONTRIBUTING.md → .github/CONTRIBUTING.md
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ This file contains a high-level description of this package's evolution. Release

## 4.7.2 - TBD

* [Bug Fix][Enhancement] Corrected an issue where protected memory was being written to with some pointer slight-of-hand. This has been in the code for a while, but appears to be caught by the compiler on OSX, under circumstances yet to be completely nailed down. See [GitHub #1486](https://github.com/Unidata/netcdf-c/issues/1486) for more information.
* [Enhancement] [Parallel IO] Added support for parallel functions in MSVC. See [Github #1492](https://github.com/Unidata/netcdf-c/pull/1492) for more information.
* [Enhancement] Added a function for changing the ncid of an open file. This function should only be used if you know what you are doing, and is meant to be used primarily with PIO integration. See [GitHub #1483](https://github.com/Unidata/netcdf-c/pull/1483) and [GitHub #1487](https://github.com/Unidata/netcdf-c/pull/1487) for more information.

Expand Down
6 changes: 3 additions & 3 deletions include/ncdispatch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,9 @@ extern int NC_inq_recvar(int ncid, int varid, int* nrecdims, int* is_recdim);
#endif

/* Vectors of ones and zeros */
extern const size_t NC_coord_zero[NC_MAX_VAR_DIMS];
extern const size_t NC_coord_one[NC_MAX_VAR_DIMS];
extern const ptrdiff_t NC_stride_one[NC_MAX_VAR_DIMS];
extern size_t NC_coord_zero[NC_MAX_VAR_DIMS];
extern size_t NC_coord_one[NC_MAX_VAR_DIMS];
extern ptrdiff_t NC_stride_one[NC_MAX_VAR_DIMS];

extern int NC_initialized;

Expand Down
9 changes: 4 additions & 5 deletions libdispatch/ddispatch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ See LICENSE.txt for license information.
#endif

/* Define vectors of zeros and ones for use with various nc_get_varX function*/
const size_t NC_coord_zero[NC_MAX_VAR_DIMS];
const size_t NC_coord_one[NC_MAX_VAR_DIMS];
const ptrdiff_t NC_stride_one[NC_MAX_VAR_DIMS];
size_t NC_coord_zero[NC_MAX_VAR_DIMS] = {0};
size_t NC_coord_one[NC_MAX_VAR_DIMS] = {1};
ptrdiff_t NC_stride_one[NC_MAX_VAR_DIMS] = {1};

NCRCglobalstate ncrc_globalstate;

Expand Down Expand Up @@ -127,7 +127,7 @@ NCDISPATCH_initialize(void)

/* Initialize curl if it is being used */
#if defined(ENABLE_BYTERANGE) || defined(ENABLE_DAP) || defined(ENABLE_DAP4)
{
{
CURLcode cstat = curl_global_init(CURL_GLOBAL_ALL);
if(cstat != CURLE_OK)
status = NC_ECURL;
Expand All @@ -146,4 +146,3 @@ NCDISPATCH_finalize(void)
#endif
return status;
}