3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-17 11:12:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Malcolm Noyes 2013-11-18 20:39:06 +00:00
commit ec0ef84226
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/internal/clara.h
View File

@ -305,6 +305,13 @@ namespace Clara {
int position; int position;
}; };
// NOTE: std::auto_ptr is deprecated in c++11/c++0x
#if defined(__cplusplus) && __cplusplus > 199711L
typedef std::unique_ptr<Arg> ArgAutoPtr;
#else
typedef std::auto_ptr<Arg> ArgAutoPtr;
#endif
class ArgBinder { class ArgBinder {
public: public:
template<typename F> template<typename F>
@ -329,7 +336,7 @@ namespace Clara {
else if( m_arg.isAnyPositional() ) { else if( m_arg.isAnyPositional() ) {
if( m_cl->m_arg.get() ) if( m_cl->m_arg.get() )
throw std::logic_error( "Only one unpositional argument can be added" ); throw std::logic_error( "Only one unpositional argument can be added" );
m_cl->m_arg = std::auto_ptr<Arg>( new Arg( m_arg ) ); m_cl->m_arg = ArgAutoPtr( new Arg( m_arg ) );
} }
else else
m_cl->m_options.push_back( m_arg ); m_cl->m_options.push_back( m_arg );
@ -373,7 +380,7 @@ namespace Clara {
m_highestSpecifiedArgPosition( other.m_highestSpecifiedArgPosition ) m_highestSpecifiedArgPosition( other.m_highestSpecifiedArgPosition )
{ {
if( other.m_arg.get() ) if( other.m_arg.get() )
m_arg = std::auto_ptr<Arg>( new Arg( *other.m_arg ) ); m_arg = ArgAutoPtr( new Arg( *other.m_arg ) );
} }
template<typename F> template<typename F>
@ -543,7 +550,7 @@ namespace Clara {
Detail::BoundArgFunction<ConfigT> m_boundProcessName; Detail::BoundArgFunction<ConfigT> m_boundProcessName;
std::vector<Arg> m_options; std::vector<Arg> m_options;
std::map<int, Arg> m_positionalArgs; std::map<int, Arg> m_positionalArgs;
std::auto_ptr<Arg> m_arg; ArgAutoPtr m_arg;
int m_highestSpecifiedArgPosition; int m_highestSpecifiedArgPosition;
}; };