diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2011-10-10 21:55:45 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2011-10-10 21:55:45 (GMT) |
| commit | 62b1372a038bca6ce0f5d121dd4170c691cacc99 (patch) | |
| tree | 3f95e150ae9ce21c09291a8aada067a8172448ae /test/enum.c | |
| parent | 873e6aea8d401c95b01c8fc866638a9c44a92f69 (diff) | |
| download | hdf5-62b1372a038bca6ce0f5d121dd4170c691cacc99.zip hdf5-62b1372a038bca6ce0f5d121dd4170c691cacc99.tar.gz hdf5-62b1372a038bca6ce0f5d121dd4170c691cacc99.tar.bz2 | |
[svn-r21508] Revoked svn check-ins 20913 and 20921 (fix for HDFFV-7579) pending a careful evaluation of enum conversion behavior.
Diffstat (limited to 'test/enum.c')
| -rw-r--r-- | test/enum.c | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/test/enum.c b/test/enum.c index df3ae3d..3684102 100644 --- a/test/enum.c +++ b/test/enum.c @@ -26,13 +26,11 @@ const char *FILENAME[] = { }; typedef enum { - E1_ERROR = -1, - E1_RED = 0, - E1_GREEN = 1, - E1_BLUE = 2, - E1_WHITE = 3, - E1_BLACK = 4, - E1_NO_COLOR + E1_RED, + E1_GREEN, + E1_BLUE, + E1_WHITE, + E1_BLACK } c_e1; @@ -121,14 +119,6 @@ test_named(hid_t file) * * Programmer: Robb Matzke * Monday, January 4, 1999 - * - * Modifications: - * Raymond Lu - * 26 May 2011 - * I added a few overflowing values (beyond the range of enumerate - * values) to make sure the library retains these values. The - * test for overflowing values when conversion happens is in the - * test_conv_enum_2() of dtypes.c. *------------------------------------------------------------------------- */ static int @@ -139,8 +129,7 @@ test_noconv(hid_t file) static c_e1 data1[]={E1_RED, E1_GREEN, E1_BLUE, E1_GREEN, E1_WHITE, E1_WHITE, E1_BLACK, E1_GREEN, E1_BLUE, E1_RED, E1_RED, E1_BLUE, E1_GREEN, E1_BLACK, E1_WHITE, - E1_RED, E1_WHITE, E1_GREEN, E1_GREEN, E1_BLUE, - E1_ERROR, E1_ERROR, E1_NO_COLOR, E1_NO_COLOR, E1_NO_COLOR}; + E1_RED, E1_WHITE, E1_GREEN, E1_GREEN, E1_BLUE}; c_e1 data2[NELMTS(data1)]; hsize_t ds_size[1]={NELMTS(data1)}; size_t i; |