diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-02-14 19:40:58 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-02-14 19:40:58 (GMT) |
| commit | 3a66bae1d8f05f812dcc1be30af4ce878343530b (patch) | |
| tree | f7ce4be7f0c32dc8d1ad88fcfc3bc4d02906f08e /src | |
| parent | 4eefbc505a329d3c03d4470ce1240980a452beb9 (diff) | |
| download | hdf5-3a66bae1d8f05f812dcc1be30af4ce878343530b.zip hdf5-3a66bae1d8f05f812dcc1be30af4ce878343530b.tar.gz hdf5-3a66bae1d8f05f812dcc1be30af4ce878343530b.tar.bz2 | |
[svn-r18253] Description:
Bring r18252 from trunk to 1.8 branch:
Rename test macros that are [nearly] identical to source code macros to
have "TEST" in their names, to avoid conflicts during compilation. (And add
comment to originals in source code, to keep them in sync).
Tested on:
Mac OS X/32 10.6.2 (amazon) w/debug & production
up041 machines (at Sandia)
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Cpkg.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/H5Cpkg.h b/src/H5Cpkg.h index bd2ea8e..b76a91a 100644 --- a/src/H5Cpkg.h +++ b/src/H5Cpkg.h @@ -1812,6 +1812,7 @@ if ( ( (cache_ptr) == NULL ) || \ HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Pre HT remove SC failed") \ } +/* (Keep in sync w/H5C_TEST__PRE_HT_SEARCH_SC macro in test/cache_common.h -QAK) */ #define H5C__PRE_HT_SEARCH_SC(cache_ptr, Addr, fail_val) \ if ( ( (cache_ptr) == NULL ) || \ ( (cache_ptr)->magic != H5C__H5C_T_MAGIC ) || \ @@ -1823,6 +1824,7 @@ if ( ( (cache_ptr) == NULL ) || \ HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, fail_val, "Pre HT search SC failed") \ } +/* (Keep in sync w/H5C_TEST__POST_SUC_HT_SEARCH_SC macro in test/cache_common.h -QAK) */ #define H5C__POST_SUC_HT_SEARCH_SC(cache_ptr, entry_ptr, Addr, k, fail_val) \ if ( ( (cache_ptr) == NULL ) || \ ( (cache_ptr)->magic != H5C__H5C_T_MAGIC ) || \ @@ -1846,6 +1848,7 @@ if ( ( (cache_ptr) == NULL ) || \ "Post successful HT search SC failed") \ } +/* (Keep in sync w/H5C_TEST__POST_HT_SHIFT_TO_FRONT macro in test/cache_common.h -QAK) */ #define H5C__POST_HT_SHIFT_TO_FRONT(cache_ptr, entry_ptr, k, fail_val) \ if ( ( (cache_ptr) == NULL ) || \ ( ((cache_ptr)->index)[k] != (entry_ptr) ) || \ |