Merge branch 'hdf5_1_8' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into hdf5_1_8

4 files changed, 11 insertions, 5 deletions

diff --git a/c++/src/H5IdComponent.cpp b/c++/src/H5IdComponent.cpp
index d869b07..d71c953 100644
--- a/c++/src/H5IdComponent.cpp
+++ b/c++/src/H5IdComponent.cpp
@@ -24,6 +24,7 @@
 
 namespace H5 {
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
 // This flag indicates whether H5Library::initH5cpp has been called to register
 // the terminating functions with atexit()
 bool IdComponent::H5cppinit = false;
@@ -32,6 +33,7 @@ bool IdComponent::H5cppinit = false;
 // Subclasses that have global constants use it.  This is a temporary
 // work-around in 1.8.16.  It will be removed after HDFFV-9540 is fixed.
 bool IdComponent::H5dontAtexit_called = false;
+#endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
 // Function:	IdComponent::incRefCount
diff --git a/c++/src/H5Library.cpp b/c++/src/H5Library.cpp
index 65f1f00..c8209e5 100644
--- a/c++/src/H5Library.cpp
+++ b/c++/src/H5Library.cpp
@@ -252,10 +252,12 @@ void H5Library::setFreeListLimits(int reg_global_lim, int reg_list_lim,
    }
 }
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
 // Default constructor - private
 H5Library::H5Library(){}
 
 // Destructor - private
 H5Library::~H5Library(){}
+#endif // DOXYGEN_SHOULD_SKIP_THIS
 
 } // end namespace
diff --git a/c++/src/H5Library.h b/c++/src/H5Library.h
index 694b052..71b7792 100644
--- a/c++/src/H5Library.h
+++ b/c++/src/H5Library.h
@@ -59,9 +59,7 @@ class H5_DLLCPP H5Library {
         static void termH5cpp(void);
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-
    private:
-
         // Default constructor - no instance ever created from outsiders
         H5Library();
 
diff --git a/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp
index 68b040e..c388af3 100644
--- a/hl/c++/test/ptableTest.cpp
+++ b/hl/c++/test/ptableTest.cpp
@@ -551,7 +551,6 @@ int SystemTest()
     return 0;
 
 error:
-
     H5E_BEGIN_TRY {
         H5Tclose(dtypeID1);
         H5Tclose(dtypeID2);
@@ -569,9 +568,14 @@ error:
  *	Previously, data of the field that follows the string was read back
  *	as garbage when #pragma pack(1) is used.
  * 2016/10/20 -BMR
+ *      Updated:
+ *		#pragma pack(1) caused failure on Emu because Sparc cannot
+ *		access misaligned data.  Changed it to pack() to do the
+ *		default alignment.
+ * 2016/10/25 -BMR
  *-------------------------------------------------------------------------
  */
-#pragma pack(1)  // no padding
+#pragma pack()  // default alignment
 const char* ABHI_PT("/abhiTest");
 const hsize_t NUM_PACKETS = 5;
 const int STRING_LENGTH = 19; // including terminating NULL
@@ -634,7 +638,7 @@ int TestHDFFV_9758()
 
     // Create a packet table
     FL_PacketTable ptable(fileID, "/examplePacketTable", compound_type, 1);
-    if (not ptable.IsValid())
+    if (!ptable.IsValid())
 	goto error;
 
     // Add packets to the table