boost/program_options
2
0
Fork 0
mirror of https://github.com/boostorg/program_options.git synced 2026-01-19 04:22:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Vladimir Prus
2018-07-06 17:35:40 +03:00
parent 331ed69055 d95d316848
commit bc0c90a70f
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/program_options/parsers.hpp
View File

@@ -190,7 +190,11 @@ namespace boost { namespace program_options {
Read from file with the given name. The character type is
passed to the file stream.
*/
#ifdef BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
template<class charT>
#else
template<class charT = char>
#endif
#if ! BOOST_WORKAROUND(__ICL, BOOST_TESTED_AT(700))
BOOST_PROGRAM_OPTIONS_DECL
#endif

3
src/options_description.cpp
View File

@@ -181,8 +181,9 @@ namespace boost { namespace program_options {
const std::pair<const std::string*, std::size_t>
option_description::long_names() const
{
// reinterpret_cast is to please msvc 10.
return (m_long_names.empty())
? std::pair<const std::string*, size_t>( NULL, 0 )
? std::pair<const std::string*, size_t>(reinterpret_cast<const std::string*>(0), 0 )
: std::pair<const std::string*, size_t>( &(*m_long_names.begin()), m_long_names.size());
}