Normalize C++ w/ develop (#3279)

1 files changed, 28 insertions, 42 deletions

diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp
index ff86213..322b72f 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;
 
@@ -76,9 +76,6 @@ typedef struct {
  * Purpose      Test type classes
  *
  * Return       None.
- *
- * Programmer   Binh-Minh Ribler (using C version)
- *              January, 2007
  *-------------------------------------------------------------------------
  */
 static void
@@ -113,9 +110,6 @@ test_classes()
  * Purpose      Test datatype copy functionality
  *
  * Return       None
- *
- * Programmer   Binh-Minh Ribler (using C version)
- *              January, 2007
  *-------------------------------------------------------------------------
  */
 static void
@@ -165,9 +159,6 @@ test_copy()
  * Purpose      Test DataType::detectClass()
  *
  * Return       None
- *
- * Programmer   Binh-Minh Ribler (using C version)
- *              August, 2017
  *-------------------------------------------------------------------------
  */
 typedef struct { /* Struct with atomic fields */
@@ -359,9 +350,6 @@ test_detect_type_class()
  * Purpose      Tests VarLenType class
  *
  * Return       None
- *
- * Programmer   Binh-Minh Ribler (use C version)
- *              August, 2017
  *-------------------------------------------------------------------------
  */
 static void
@@ -432,9 +420,6 @@ test_vltype()
  * Purpose      Tests query functions of compound and enumeration types.
  *
  * Return       None
- *
- * Programmer   Binh-Minh Ribler (use C version)
- *              January, 2007
  *-------------------------------------------------------------------------
  */
 const H5std_string CompT_NAME("Compound_type");
@@ -462,11 +447,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();
@@ -552,9 +542,6 @@ test_query()
  * Purpose      Tests transient datatypes.
  *
  * Return       None
- *
- * Programmer   Binh-Minh Ribler (use C version)
- *              January, 2007
  *-------------------------------------------------------------------------
  */
 
@@ -631,9 +618,6 @@ test_transient()
  * Purpose      Tests named datatypes.
  *
  * Return       None
- *
- * Programmer   Binh-Minh Ribler (use C version)
- *              January, 2007
  *-------------------------------------------------------------------------
  */
 
@@ -798,9 +782,6 @@ test_named()
  * Purpose      Test datatype encode/decode functionality.
  *
  * Return       None
- *
- * Programmer   Binh-Minh Ribler (using C version)
- *              August, 2017
  *-------------------------------------------------------------------------
  */
 const int ARRAY1_RANK = 1;
@@ -859,11 +840,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();
@@ -1018,9 +1004,6 @@ test_encode_decode()
  * Purpose      Test datatype encode/decode functionality.
  *
  * Return       None
- *
- * Programmer   Binh-Minh Ribler (using C version)
- *              August, 2017
  *-------------------------------------------------------------------------
  */
 
@@ -1060,9 +1043,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__);