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

summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMartin Hořeňovský2022-06-17 18:23:06 +0200
committerMartin Hořeňovský2022-06-17 18:23:06 +0200
commit165647abbcbf27dcdae074bdb9d5fe2eaffceb67 (patch)
treec8d3ca76779076efb920f3b217a200331b278a68 /src
parent7e4ec432d00ccb082846bf9a74c6d8b48e039ba9 (diff)
downloadcatch3-165647abbcbf27dcdae074bdb9d5fe2eaffceb67.tar.gz
Change provideBazelReporterOutput to local linkage
Diffstat (limited to 'src')
-rw-r--r--src/catch2/catch_config.cpp45
1 files changed, 22 insertions, 23 deletions
diff --git a/src/catch2/catch_config.cpp b/src/catch2/catch_config.cpp
index a0f1638e..4465831d 100644
--- a/src/catch2/catch_config.cpp
+++ b/src/catch2/catch_config.cpp
@@ -13,10 +13,29 @@
#include <catch2/internal/catch_test_spec_parser.hpp>
#include <catch2/interfaces/catch_interfaces_tag_alias_registry.hpp>
-namespace Catch {
+namespace {
+ bool provideBazelReporterOutput() {
+#ifdef CATCH_CONFIG_BAZEL_SUPPORT
+ return true;
+#else
- // Requires declaration for -Wmissing-declarations.
- bool provideBazelReporterOutput();
+# if defined( _MSC_VER )
+ // On Windows getenv throws a warning as there is no input validation,
+ // since the switch is hardcoded, this should not be an issue.
+# pragma warning( push )
+# pragma warning( disable : 4996 )
+# endif
+
+ return std::getenv( "BAZEL_TEST" ) != nullptr;
+
+# if defined( _MSC_VER )
+# pragma warning( pop )
+# endif
+#endif
+ }
+}
+
+namespace Catch {
bool operator==( ProcessedReporterSpec const& lhs,
ProcessedReporterSpec const& rhs ) {
@@ -116,26 +135,6 @@ namespace Catch {
bool Config::listReporters() const { return m_data.listReporters; }
bool Config::listListeners() const { return m_data.listListeners; }
- bool provideBazelReporterOutput() {
-#ifdef CATCH_CONFIG_BAZEL_SUPPORT
- return true;
-#else
-
-# if defined( _MSC_VER )
- // On Windows getenv throws a warning as there is no input validation,
- // since the switch is hardcoded, this should not be an issue.
-# pragma warning( push )
-# pragma warning( disable : 4996 )
-# endif
-
- return std::getenv("BAZEL_TEST") != nullptr;
-
-# if defined( _MSC_VER )
-# pragma warning( pop )
-# endif
-#endif
- }
-
std::vector<std::string> const& Config::getTestsOrTags() const { return m_data.testsOrTags; }
std::vector<std::string> const& Config::getSectionsToRun() const { return m_data.sectionsToRun; }