Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/include/internal/catch_session.cpp
diff options
context:
space:
mode:
authorMartin Hořeňovský2018-03-07 10:37:50 +0100
committerGitHub2018-03-07 10:37:50 +0100
commit552589f25bb469daa054fa37edee7f564ca1e309 (patch)
tree479c38b5fb84fa0cb65ac7b111eeda7b4bda7f8d /include/internal/catch_session.cpp
parent95c849f613a79cb3c7f59aa0589304513688aba1 (diff)
parentb11175548afa0cb6ea03b9f73d7e038cf6d6688e (diff)
downloadcatch3-552589f25bb469daa054fa37edee7f564ca1e309.tar.gz
Merge branch 'master' into master
Diffstat (limited to 'include/internal/catch_session.cpp')
-rw-r--r--include/internal/catch_session.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/internal/catch_session.cpp b/include/internal/catch_session.cpp
index 0039fcb5..0581ac88 100644
--- a/include/internal/catch_session.cpp
+++ b/include/internal/catch_session.cpp
@@ -133,7 +133,7 @@ namespace Catch {
if ( !exceptions.empty() ) {
m_startupExceptions = true;
Colour colourGuard( Colour::Red );
- Catch::cerr() << "Errors occured during startup!" << '\n';
+ Catch::cerr() << "Errors occurred during startup!" << '\n';
// iterate over all exceptions and notify user
for ( const auto& ex_ptr : exceptions ) {
try {
@@ -165,7 +165,7 @@ namespace Catch {
<< std::left << std::setw(16) << "version: " << libraryVersion() << std::endl;
}
- int Session::applyCommandLine( int argc, char* argv[] ) {
+ int Session::applyCommandLine( int argc, char const * const * argv ) {
if( m_startupExceptions )
return 1;