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.

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

Remove obsolete _CRAYMPP and LOCKNUMREC macros #1464

Merged
merged 22 commits into from
Aug 21, 2019
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
Merge branch 'master' into ejh_next
  • Loading branch information
edhartnett authored Aug 16, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit bce3fa616980a59bad583c5b1353f3deb719d3e1
6 changes: 6 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -14,6 +14,12 @@ developed. Programmers interested in parallel I/O should see
nc_open_par() and nc_create_par().
See [GitHub #1436](https://github.com/Unidata/netcdf-c/issues/1459)

* [Enhancement] Remove obsolete and deprecated functions
nc_set_base_pe() and nc_inq_base_pe() from the dispatch table. (Both
functions are still supported in the library, this is an internal
change only.)
See [GitHub #1436](https://github.com/Unidata/netcdf-c/issues/1468)

* [Bug Fix] Reverted nccopy behavior so that if no -c parameters
are given, then any default chunking is left to the netcdf-c library
to decide.
33 changes: 0 additions & 33 deletions libsrc/nc3internal.c
Original file line number Diff line number Diff line change
@@ -1537,39 +1537,6 @@ NC3_set_fill(int ncid,
return NC_NOERR;
}

/**
* This obsolete function is retained for backward compatibility. It
* does nothing.
*
* @param ncid Ignored.
* @param pe Ignored.
*
* @return NC_NOERR No error.
* @author Glenn Davis, Ed Hartnett
*/
int
NC3_set_base_pe(int ncid, int pe)
{
return NC_NOERR;
}

/**
* This obsolete function is retained for backward compatibility. It
* does nothing, and always returns pe = 0.
*
* @param ncid Ignored.
* @param pe Pointer to int that gets a 0. Ignored if NULL.
*
* @return NC_NOERR No error.
* @author Glenn Davis, Ed Hartnett
*/
int
NC3_inq_base_pe(int ncid, int *pe)
{
if (pe) *pe = 0;
return NC_NOERR;
}

/**
* Return the file format.
*
You are viewing a condensed version of this merge commit. You can view the full changes here.