diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2015-04-06 23:47:09 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2015-04-06 23:47:09 (GMT) |
| commit | 343a52747c234f41da2e007a696786a51f74ad69 (patch) | |
| tree | e5e0d34cc44afb19c5d13c89a9b19037f4284a38 /c++/src/H5Object.cpp | |
| parent | 5a810576d55f21ee8a872b904026647358113836 (diff) | |
| download | hdf5-343a52747c234f41da2e007a696786a51f74ad69.zip hdf5-343a52747c234f41da2e007a696786a51f74ad69.tar.gz hdf5-343a52747c234f41da2e007a696786a51f74ad69.tar.bz2 | |
[svn-r26743] Purpose: Fix daily test failure
Description:
- In DataType::DataType(const PredType& pred_type), using DataType::copy
will invoke DataType::close() unnecessarily, which will produce undefined
behavior. Changed to call H5Tcopy directly, code reuse is not useful in
this case.
- Also, fixed CommonFG::childObjVersion to return expected value outside of
an if/else block.
Merged from trunk r26737.
Platforms tested:
Linux/ppc64 (ostrich)
Linux/64 (platypus)
Linux/32 2.6 (jam)
Diffstat (limited to 'c++/src/H5Object.cpp')
| -rw-r--r-- | c++/src/H5Object.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/c++/src/H5Object.cpp b/c++/src/H5Object.cpp index df3f565..56e88e0 100644 --- a/c++/src/H5Object.cpp +++ b/c++/src/H5Object.cpp @@ -14,6 +14,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include <string> +#include <iostream> #include "H5Include.h" #include "H5Exception.h" @@ -35,6 +36,7 @@ #ifndef H5_NO_NAMESPACE namespace H5 { +using namespace std; #endif #ifndef DOXYGEN_SHOULD_SKIP_THIS |