diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-30 13:22:44 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-30 13:22:44 (GMT) |
| commit | 9e9f96879d760850794a191988a205fbf1a3957d (patch) | |
| tree | bc7afacf87ac7f5d4d4e71923ea44a6cefef14b8 /c++ | |
| parent | 5b7788f3ececa7efa6b91c4d0806e672ed724d14 (diff) | |
| download | hdf5-9e9f96879d760850794a191988a205fbf1a3957d.zip hdf5-9e9f96879d760850794a191988a205fbf1a3957d.tar.gz hdf5-9e9f96879d760850794a191988a205fbf1a3957d.tar.bz2 | |
[svn-r15295] Description:
Merge revisions 15130:15210 from trunk into metadata journaling branch
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/src/H5Exception.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/c++/src/H5Exception.h b/c++/src/H5Exception.h index d422edb..c17ff5b 100644 --- a/c++/src/H5Exception.h +++ b/c++/src/H5Exception.h @@ -79,12 +79,6 @@ class H5_DLLCPP Exception { virtual ~Exception(); private: -// Because 'string' is not instantiated at compilation time, this -// warning is displayed when building DLL; but the class is exported -// so the warning is harmless -#if defined(_WIN32) -#pragma warning(disable: 4251) -#endif H5std_string detail_message; H5std_string func_name; |