diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2016-10-26 19:34:02 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2016-10-26 19:34:02 (GMT) |
| commit | 04b99c0c66ede0ac5b3e22f38e9277f9a916d010 (patch) | |
| tree | 756c2a7c86ed66dd8410b37f959b9d31075c26cd | |
| parent | 581c0acfa9eb1eb6cb22d8973f7f0aec973b9e06 (diff) | |
| parent | 889d7fd73341a377dff98673d08031e422c18ab0 (diff) | |
| download | hdf5-04b99c0c66ede0ac5b3e22f38e9277f9a916d010.zip hdf5-04b99c0c66ede0ac5b3e22f38e9277f9a916d010.tar.gz hdf5-04b99c0c66ede0ac5b3e22f38e9277f9a916d010.tar.bz2 | |
Merge pull request #108 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_packet_table:develop to develop
Work-around for Emu's alignment problem.
* commit '889d7fd73341a377dff98673d08031e422c18ab0':
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)
| -rw-r--r-- | c++/src/H5Library.cpp | 2 | ||||
| -rw-r--r-- | hl/c++/test/ptableTest.cpp | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/c++/src/H5Library.cpp b/c++/src/H5Library.cpp index 4d1f279..1726121 100644 --- a/c++/src/H5Library.cpp +++ b/c++/src/H5Library.cpp @@ -253,6 +253,7 @@ void H5Library::setFreeListLimits(int reg_global_lim, int reg_list_lim, } } +#ifndef DOXYGEN_SHOULD_SKIP_THIS //-------------------------------------------------------------------------- // Function: H5Library default constructor - private ///\brief Default constructor: Creates a stub H5Library object @@ -266,5 +267,6 @@ H5Library::H5Library(){} // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- H5Library::~H5Library(){} +#endif // DOXYGEN_SHOULD_SKIP_THIS } // end namespace diff --git a/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp index 67efda5..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 |