3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor session tweaks

This commit is contained in:
Phil Nash 2017-06-29 14:27:42 +01:00
parent 03afbdfec9
commit 63a8017ba7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/catch_session.hpp
View File

@ -18,7 +18,7 @@
#include "internal/catch_startup_exception_registry.h" #include "internal/catch_startup_exception_registry.h"
#include <fstream> #include <fstream>
#include <stdlib.h> #include <cstdlib>
#include <limits> #include <limits>
namespace Catch { namespace Catch {
@ -86,7 +86,7 @@ namespace Catch {
if( lastSlash != std::string::npos ) if( lastSlash != std::string::npos )
filename = filename.substr( lastSlash+1 ); filename = filename.substr( lastSlash+1 );
std::string::size_type lastDot = filename.find_last_of( "." ); std::string::size_type lastDot = filename.find_last_of( '.' );
if( lastDot != std::string::npos ) if( lastDot != std::string::npos )
filename = filename.substr( 0, lastDot ); filename = filename.substr( 0, lastDot );
@ -106,11 +106,11 @@ namespace Catch {
alreadyInstantiated = true; alreadyInstantiated = true;
m_cli = makeCommandLineParser( m_configData ); m_cli = makeCommandLineParser( m_configData );
} }
~Session() { ~Session() override {
Catch::cleanUp(); Catch::cleanUp();
} }
void showHelp( std::string const& ) { void showHelp() {
Catch::cout() << "\nCatch v" << libraryVersion() << "\n"; Catch::cout() << "\nCatch v" << libraryVersion() << "\n";
Catch::cout() << m_cli << std::endl; Catch::cout() << m_cli << std::endl;
@ -132,7 +132,7 @@ namespace Catch {
} }
if( m_configData.showHelp ) if( m_configData.showHelp )
showHelp( m_configData.processName ); showHelp();
m_config.reset(); m_config.reset();
return 0; return 0;
} }