summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2021-08-21 14:30:18 (GMT)
committerGitHub <noreply@github.com>2021-08-21 14:30:18 (GMT)
commit0a9099807a127a74b35ecf2c4ad98d6571f2e753 (patch)
treecf4d8e1802c7112e6e35f03ad355465b1e0b435a
parentd4a9a064cbcc11965cc67c79c1690a7f92c2e1cb (diff)
downloadhdf5-0a9099807a127a74b35ecf2c4ad98d6571f2e753.zip
hdf5-0a9099807a127a74b35ecf2c4ad98d6571f2e753.tar.gz
hdf5-0a9099807a127a74b35ecf2c4ad98d6571f2e753.tar.bz2
Fixed MSVC compile error in C++23 mode (#945)
Error message from MSVC with C++23 enabled: error C2440: 'return': cannot convert from 'int' to 'std::basic_string<char,std::char_traits,std::allocator>' Co-authored-by: Sean McBride <sean@rogue-research.com>
-rw-r--r--c++/src/H5PropList.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/c++/src/H5PropList.cpp b/c++/src/H5PropList.cpp
index fda4114..1300641 100644
--- a/c++/src/H5PropList.cpp
+++ b/c++/src/H5PropList.cpp
@@ -548,7 +548,7 @@ PropList::getPropSize(const H5std_string &name) const
// Function: PropList::getClassName
///\brief Return the name of a generic property list class.
///\return A string containing the class name, if success, otherwise,
-/// a NULL string.
+/// an empty string.
// Programmer: Binh-Minh Ribler - April, 2004
//--------------------------------------------------------------------------
H5std_string
@@ -562,8 +562,9 @@ PropList::getClassName() const
return (class_name);
}
else
- return 0;
+ return "";
}
+
//--------------------------------------------------------------------------
// Function: PropList::getNumProps
///\brief Returns the number of properties in this property list or class.