Description:

    - In the test for HDFFV-9758, a pragma pack(1) caused failure on Emu
    because Sparc cannot access misaligned data.  Changed it to pack() to
    do the default alignment.
    - Added DOXYGEN_SHOULD_SKIP_THIS blocks to private elements to prevent
    warnings from doxygen.
Platforms tested:
    SunOS 5.11 (emu)
    Linux/32 2.6 (jam)

3 files changed, 4 insertions, 2 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();