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

summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorPhil Nash2014-03-10 18:02:18 +0000
committerPhil Nash2014-03-10 18:02:18 +0000
commitf9df35b12ba745d1a82c8ab82018751dddca9595 (patch)
treef2f0bbb7a3d932bd5f682a71c0a810f042921284 /include
parentdd2810d60af6fd49946dd6992536aa4fb14cb7f0 (diff)
downloadcatch3-f9df35b12ba745d1a82c8ab82018751dddca9595.tar.gz
Fixed instance of Clara::_ placeholder when using CATCH_CONFIG_RUNNER
Diffstat (limited to 'include')
-rw-r--r--include/catch.hpp3
-rw-r--r--include/internal/catch_version.hpp2
2 files changed, 4 insertions, 1 deletions
diff --git a/include/catch.hpp b/include/catch.hpp
index cb8a19c1..91d392b0 100644
--- a/include/catch.hpp
+++ b/include/catch.hpp
@@ -19,6 +19,9 @@
#ifdef CATCH_CONFIG_MAIN
# define CATCH_CONFIG_RUNNER
+#endif
+
+#ifdef CATCH_CONFIG_RUNNER
# ifndef CLARA_CONFIG_MAIN
# define CLARA_CONFIG_MAIN_NOT_DEFINED
# define CLARA_CONFIG_MAIN
diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp
index 85181d64..98833ec2 100644
--- a/include/internal/catch_version.hpp
+++ b/include/internal/catch_version.hpp
@@ -13,7 +13,7 @@
namespace Catch {
// These numbers are maintained by a script
- Version libraryVersion( 1, 0, 30, "master" );
+ Version libraryVersion( 1, 0, 31, "master" );
}
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED