further removal of RELAX_COORD_BOUNDS macro

This commit is contained in:
Edward Hartnett 2019-11-26 06:45:26 -07:00
parent ccaaa2e745
commit 6a902fe210
2 changed files with 1 additions and 11 deletions

View File

@ -56,7 +56,7 @@
#define NC_HAS_CDF5 @NC_HAS_CDF5@ /*!< CDF5 support. */
#define NC_HAS_ERANGE_FILL @NC_HAS_ERANGE_FILL@ /*!< ERANGE_FILL Support */
#define NC_RELAX_COORD_BOUND @NC_RELAX_COORD_BOUND@ /*!< RELAX_COORD_BOUND */
#define NC_RELAX_COORD_BOUND 1 /*!< RELAX_COORD_BOUND */
#define NC_DISPATCH_VERSION @NC_DISPATCH_VERSION@ /*!< Dispatch table version */
#endif

View File

@ -751,13 +751,8 @@ ifdef(`PNETCDF',`dnl
start[j] = 0;
continue;
}
#ifdef RELAX_COORD_BOUND
IF (err != NC_NOERR) /* allowed when edge[j]==0 */
EXPECT_ERR(NC_NOERR, err)
#else
IF (err != NC_EINVALCOORDS) /* not allowed even when edge[j]==0 */
EXPECT_ERR(NC_EINVALCOORDS, err)
#endif
start[j] = var_shape[i][j]+1; /* should cause NC_EINVALCOORDS */
err = GetVars($1)(ncid, i, start, edge, stride, value);
IF (err != NC_EINVALCOORDS)
@ -1049,13 +1044,8 @@ ifdef(`PNETCDF',`dnl
start[j] = 0;
continue;
}
#ifdef RELAX_COORD_BOUND
IF (err != NC_NOERR) /* allowed when edge[j]==0 */
EXPECT_ERR(NC_NOERR, err)
#else
IF (err != NC_EINVALCOORDS) /* not allowed even when edge[j]==0 */
EXPECT_ERR(NC_EINVALCOORDS, err)
#endif
start[j] = var_shape[i][j]+1; /* should cause NC_EINVALCOORDS */
err = GetVarm($1)(ncid, i, start, edge, stride, imap, value);
IF (err != NC_EINVALCOORDS)