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

Fixed "char * const" versus "const char *" confusions throught the code base.

This commit is contained in:
Javier Espert Real 2015-05-27 20:56:41 +01:00
parent c51e86819d
commit d0f5996864
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,6 +1,6 @@
![catch logo](catch-logo-small.png)
*v1.1 build 3 (master branch)*
*v1.1 build 4 (master branch)*
Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)

6
docs/own-main.md
View File

@ -16,7 +16,7 @@ If you just need to have code that executes before and/ or after Catch this is t
#define CATCH_CONFIG_RUNNER
#include "catch.hpp"
int main( int argc, char* const argv[] )
int main( int argc, char const * argv[] )
{
// global setup...
@ -36,7 +36,7 @@ If you still want Catch to process the command line, but you want to programatic
#define CATCH_CONFIG_RUNNER
#include "catch.hpp"
int main( int argc, char* const argv[] )
int main( int argc, char const * argv[] )
{
Catch::Session session; // There must be exactly once instance
@ -65,4 +65,4 @@ Catch embeds a powerful command line parser which you can also use to parse your
---
[Home](Readme.md)
[Home](Readme.md)

4
include/catch_runner.hpp
View File

@ -137,7 +137,7 @@ namespace Catch {
Catch::cout() << "For more detail usage please see the project docs\n" << std::endl;
}
int applyCommandLine( int argc, char* const argv[], OnUnusedOptions::DoWhat unusedOptionBehaviour = OnUnusedOptions::Fail ) {
int applyCommandLine( int argc, char const * argv[], OnUnusedOptions::DoWhat unusedOptionBehaviour = OnUnusedOptions::Fail ) {
try {
m_cli.setThrowOnUnrecognisedTokens( unusedOptionBehaviour == OnUnusedOptions::Fail );
m_unusedTokens = m_cli.parseInto( argc, argv, m_configData );
@ -163,7 +163,7 @@ namespace Catch {
m_config.reset();
}
int run( int argc, char* const argv[] ) {
int run( int argc, char const * argv[] ) {
int returnCode = applyCommandLine( argc, argv );
if( returnCode == 0 )

6
include/internal/catch_default_main.hpp
View File

@ -11,20 +11,20 @@
#ifndef __OBJC__
// Standard C/C++ main entry point
int main (int argc, char * const argv[]) {
int main (int argc, char const * argv[]) {
return Catch::Session().run( argc, argv );
}
#else // __OBJC__
// Objective-C entry point
int main (int argc, char * const argv[]) {
int main (int argc, char const * argv[]) {
#if !CATCH_ARC_ENABLED
NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
#endif
Catch::registerTestMethods();
int result = Catch::Session().run( argc, (char* const*)argv );
int result = Catch::Session().run( argc, argv );
#if !CATCH_ARC_ENABLED
[pool drain];

2
include/internal/catch_version.hpp
View File

@ -13,7 +13,7 @@
namespace Catch {
// These numbers are maintained by a script
Version libraryVersion( 1, 1, 3, "master" );
Version libraryVersion( 1, 1, 4, "master" );
}
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED

16
single_include/catch.hpp
View File

@ -1,6 +1,6 @@
/*
* CATCH v1.1 build 3 (master branch)
* Generated: 2015-05-21 06:16:00.388118
* CATCH v1.1 build 4 (master branch)
* Generated: 2015-05-27 20:46:59.941284
* ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@ -5681,7 +5681,7 @@ namespace Catch {
Catch::cout() << "For more detail usage please see the project docs\n" << std::endl;
}
int applyCommandLine( int argc, char* const argv[], OnUnusedOptions::DoWhat unusedOptionBehaviour = OnUnusedOptions::Fail ) {
int applyCommandLine( int argc, char const * argv[], OnUnusedOptions::DoWhat unusedOptionBehaviour = OnUnusedOptions::Fail ) {
try {
m_cli.setThrowOnUnrecognisedTokens( unusedOptionBehaviour == OnUnusedOptions::Fail );
m_unusedTokens = m_cli.parseInto( argc, argv, m_configData );
@ -5707,7 +5707,7 @@ namespace Catch {
m_config.reset();
}
int run( int argc, char* const argv[] ) {
int run( int argc, char const * argv[] ) {
int returnCode = applyCommandLine( argc, argv );
if( returnCode == 0 )
@ -6807,7 +6807,7 @@ namespace Catch {
namespace Catch {
// These numbers are maintained by a script
Version libraryVersion( 1, 1, 3, "master" );
Version libraryVersion( 1, 1, 4, "master" );
}
// #included from: catch_message.hpp
@ -9274,20 +9274,20 @@ namespace Catch {
#ifndef __OBJC__
// Standard C/C++ main entry point
int main (int argc, char * const argv[]) {
int main (int argc, char const * argv[]) {
return Catch::Session().run( argc, argv );
}
#else // __OBJC__
// Objective-C entry point
int main (int argc, char * const argv[]) {
int main (int argc, char const * argv[]) {
#if !CATCH_ARC_ENABLED
NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
#endif
Catch::registerTestMethods();
int result = Catch::Session().run( argc, (char* const*)argv );
int result = Catch::Session().run( argc, argv );
#if !CATCH_ARC_ENABLED
[pool drain];