diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-01-07 15:37:14 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-01-07 15:37:14 (GMT) |
| commit | 008fbc9d453980011fb306b504b7e9bb4c5d9c72 (patch) | |
| tree | eab904dbc78fa27b146a60abf50fb7ee95d6bd0d | |
| parent | fa754ebcbda8795d7a5412e4ab7e1bf897bbdf65 (diff) | |
| download | hdf5-008fbc9d453980011fb306b504b7e9bb4c5d9c72.zip hdf5-008fbc9d453980011fb306b504b7e9bb4c5d9c72.tar.gz hdf5-008fbc9d453980011fb306b504b7e9bb4c5d9c72.tar.bz2 | |
[svn-r19925] bring BZ1165 solution from trunk.
| -rw-r--r-- | c++/src/H5Exception.cpp | 2 | ||||
| -rw-r--r-- | c++/src/H5Exception.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/c++/src/H5Exception.cpp b/c++/src/H5Exception.cpp index e00b1de..8513372 100644 --- a/c++/src/H5Exception.cpp +++ b/c++/src/H5Exception.cpp @@ -22,7 +22,7 @@ namespace H5 { #endif -const H5std_string Exception::DEFAULT_MSG("No detailed information provided"); +const char Exception::DEFAULT_MSG[] = "No detailed information provided"; //-------------------------------------------------------------------------- // Function: Exception default constructor diff --git a/c++/src/H5Exception.h b/c++/src/H5Exception.h index c17ff5b..9bc3ab2 100644 --- a/c++/src/H5Exception.h +++ b/c++/src/H5Exception.h @@ -17,6 +17,7 @@ #ifndef _H5Exception_H #define _H5Exception_H +#pragma warning (disable : 4251) #include <string> #ifndef H5_NO_NAMESPACE @@ -84,7 +85,7 @@ class H5_DLLCPP Exception { protected: // Default value for detail_message - static const H5std_string DEFAULT_MSG; + static const char DEFAULT_MSG[]; }; class H5_DLLCPP FileIException : public Exception { |