diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-10-16 18:04:11 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-10-16 18:04:11 (GMT) |
| commit | 366f0151ddf63b0a08c4cef7f295d78d9ecd117d (patch) | |
| tree | 2bcff4c4f4e8c4caa5dbd890ab441682a75f62bd /src/H5Pfapl.c | |
| parent | adb2fd1cc0858602046959689377dbdb60a4c3a6 (diff) | |
| parent | 370e6f3f56bafa13c19eaa292a16929a8b918120 (diff) | |
| download | hdf5-366f0151ddf63b0a08c4cef7f295d78d9ecd117d.zip hdf5-366f0151ddf63b0a08c4cef7f295d78d9ecd117d.tar.gz hdf5-366f0151ddf63b0a08c4cef7f295d78d9ecd117d.tar.bz2 | |
[svn-r24301] merge from trunk.
resolve conflicts, etc...
Diffstat (limited to 'src/H5Pfapl.c')
| -rw-r--r-- | src/H5Pfapl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c index 82833c1..f9ae114 100644 --- a/src/H5Pfapl.c +++ b/src/H5Pfapl.c @@ -2705,7 +2705,7 @@ H5P__facc_cache_config_cmp(const void *_config1, const void *_config2, size_t UN if(config1->close_trace_file > config2->close_trace_file) HGOTO_DONE(1); if((ret_value = HDstrncmp(config1->trace_file_name, config2->trace_file_name, - H5AC__MAX_TRACE_FILE_NAME_LEN + 1)) != 0) + (size_t)(H5AC__MAX_TRACE_FILE_NAME_LEN + 1))) != 0) HGOTO_DONE(ret_value); if(config1->evictions_enabled < config2->evictions_enabled) HGOTO_DONE(-1); |