1 files changed, 6 insertions, 23 deletions
diff --git a/c++/test/tobject.cpp b/c++/test/tobject.cpp
index 59716dd..c053604 100644
--- a/c++/test/tobject.cpp
+++ b/c++/test/tobject.cpp
@@ -22,13 +22,10 @@
 #else
 #include <iostream>
 #endif
-#include <string>
-
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
+using std::cerr;
+using std::endl;
 
+#include <string>
 #include "H5Cpp.h"      // C++ API header file
 using namespace H5;
 
@@ -61,8 +58,6 @@ const H5std_string      DSET_IN_GRP1_2_PATH("/Top Group/Sub-Group 1.2/Dataset in
  * Programmer:  Binh-Minh Ribler
  *              Friday, March 4, 2014
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void test_get_objname()
@@ -159,8 +154,6 @@ static void test_get_objname()
  * Programmer:  Binh-Minh Ribler
  *              March 4, 2014
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void test_get_objname_ontypes()
@@ -244,8 +237,6 @@ static void test_get_objname_ontypes()
  * Programmer:  Binh-Minh Ribler
  *              Friday, March 4, 2014
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void test_get_objtype()
@@ -301,15 +292,13 @@ static void test_get_objtype()
 /*-------------------------------------------------------------------------
  * Function:    test_open_object_header
  *
- * Purpose      Test H5Location::openObjId function.
+ * Purpose:     Test H5Location::openObjId function.
  *
- * Return       None
+ * Return:      None
  *
- * Programmer   Binh-Minh Ribler (use C version)
+ * Programmer:  Binh-Minh Ribler (use C version)
  *              May 15, 2017
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 const H5std_string GROUPNAME("group");
@@ -428,8 +417,6 @@ static void test_open_object_header()
  * Programmer:  Binh-Minh Ribler
  *              May 15, 2017
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void test_is_valid()
@@ -483,8 +470,6 @@ static void test_is_valid()
  * Programmer:  Binh-Minh Ribler
  *              Friday, Mar 4, 2014
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 extern "C"
@@ -510,8 +495,6 @@ void test_object()
  *
  * Programmer:  (use C version)
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 extern "C"