summaryrefslogtreecommitdiffstats
path: root/c++/test/ttypes.cpp
diff options
context:
space:
mode:
authorSean McBride <sean@rogue-research.com>2023-06-19 05:13:38 (GMT)
committerGitHub <noreply@github.com>2023-06-19 05:13:38 (GMT)
commit65d8c9347010771473b53c91adcec2f281772213 (patch)
tree487567dae0dc005de896f616b90e67744239a5e2 /c++/test/ttypes.cpp
parent1f20354ee6cdfa9fd157ac9cdfff9acdf320a32d (diff)
downloadhdf5-65d8c9347010771473b53c91adcec2f281772213.zip
hdf5-65d8c9347010771473b53c91adcec2f281772213.tar.gz
hdf5-65d8c9347010771473b53c91adcec2f281772213.tar.bz2
Many fixes to various compiler warnings (#3124)
* Fixed various -Wmissing-variable-declarations by adding static keyword * In a few cases, renamed the variable suffix from _g to _s. * Fixed some -Wmissing-variable-declarations by using different declaration macros * Fixed various -Wconditional-uninitialized warnings by just initializing variable to zero * Fixed various -Wcomma warnings * Fixed clang -Wstrict-prototypes warnings * Fixed various -Wunused-variable warnings * Updated some casts to fix the only 3 -Wcast-qual warnings * Fixed the only -Wsometimes-uninitialized warning
Diffstat (limited to 'c++/test/ttypes.cpp')
-rw-r--r--c++/test/ttypes.cpp43
1 files changed, 28 insertions, 15 deletions
diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp
index ff86213..16ed192 100644
--- a/c++/test/ttypes.cpp
+++ b/c++/test/ttypes.cpp
@@ -44,8 +44,8 @@ using namespace H5;
/* #include "H5Tpkg.h"
*/
-const char *FILENAME[] = {"dtypes1.h5", "dtypes2.h5", "dtypes3.h5", "dtypes4.h5",
- "encode_decode.h5", "h5_type_operators.h5", NULL};
+static const char *FILENAME[] = {"dtypes1.h5", "dtypes2.h5", "dtypes3.h5", "dtypes4.h5",
+ "encode_decode.h5", "h5_type_operators.h5", NULL};
typedef enum flt_t { FLT_FLOAT, FLT_DOUBLE, FLT_LDOUBLE, FLT_OTHER } flt_t;
@@ -462,11 +462,16 @@ test_query()
// Create a enumerate datatype
EnumType tid2(sizeof(short));
- tid2.insert("RED", (enum_val = 0, &enum_val));
- tid2.insert("GREEN", (enum_val = 1, &enum_val));
- tid2.insert("BLUE", (enum_val = 2, &enum_val));
- tid2.insert("ORANGE", (enum_val = 3, &enum_val));
- tid2.insert("YELLOW", (enum_val = 4, &enum_val));
+ enum_val = 0;
+ tid2.insert("RED", &enum_val);
+ enum_val = 1;
+ tid2.insert("GREEN", &enum_val);
+ enum_val = 2;
+ tid2.insert("BLUE", &enum_val);
+ enum_val = 3;
+ tid2.insert("ORANGE", &enum_val);
+ enum_val = 4;
+ tid2.insert("YELLOW", &enum_val);
// Query member number and member index by name, for compound type
int nmembs = tid1.getNmembers();
@@ -859,11 +864,16 @@ test_encode_decode()
// Create a enumerate datatype
EnumType enumtyp(sizeof(short));
- enumtyp.insert("RED", (enum_val = 0, &enum_val));
- enumtyp.insert("GREEN", (enum_val = 1, &enum_val));
- enumtyp.insert("BLUE", (enum_val = 2, &enum_val));
- enumtyp.insert("ORANGE", (enum_val = 3, &enum_val));
- enumtyp.insert("YELLOW", (enum_val = 4, &enum_val));
+ enum_val = 0;
+ enumtyp.insert("RED", &enum_val);
+ enum_val = 1;
+ enumtyp.insert("GREEN", &enum_val);
+ enum_val = 2;
+ enumtyp.insert("BLUE", &enum_val);
+ enum_val = 3;
+ enumtyp.insert("ORANGE", &enum_val);
+ enum_val = 4;
+ enumtyp.insert("YELLOW", &enum_val);
// Encode compound type in a buffer
enumtyp.encode();
@@ -1060,9 +1070,12 @@ test_operators()
// Create an enumerate datatype
EnumType enumtyp(sizeof(short));
- enumtyp.insert("RED", (enum_val = 0, &enum_val));
- enumtyp.insert("GREEN", (enum_val = 1, &enum_val));
- enumtyp.insert("BLUE", (enum_val = 2, &enum_val));
+ enum_val = 0;
+ enumtyp.insert("RED", &enum_val);
+ enum_val = 1;
+ enumtyp.insert("GREEN", &enum_val);
+ enum_val = 2;
+ enumtyp.insert("BLUE", &enum_val);
// Verify that operator== and operator!= work properly
verify_val(cmptyp == enumtyp, false, "DataType::operator==", __LINE__, __FILE__);