Skip to content

Commit

Permalink
fixed #267
Browse files Browse the repository at this point in the history
  • Loading branch information
Viktor Kirilov committed Aug 11, 2019
1 parent 8f510f9 commit 9260898
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions doctest/doctest.h
Expand Up @@ -400,7 +400,7 @@ DOCTEST_GCC_SUPPRESS_WARNING_POP
// Forward declaring 'X' in namespace std is not permitted by the C++ Standard.
DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4643)

DOCTEST_STD_NAMESPACE_BEGIN
DOCTEST_STD_NAMESPACE_BEGIN // NOLINT (cert-dcl58-cpp)
typedef decltype(nullptr) nullptr_t;
template <class charT>
struct char_traits;
Expand Down Expand Up @@ -2939,7 +2939,7 @@ namespace detail {
return oss.str().c_str();
}

DOCTEST_THREAD_LOCAL std::ostringstream g_oss;
DOCTEST_THREAD_LOCAL std::ostringstream g_oss; // NOLINT(cert-err58-cpp)

std::ostream* getTlsOss() {
g_oss.clear(); // there shouldn't be anything worth clearing in the flags
Expand Down Expand Up @@ -3534,7 +3534,7 @@ namespace detail {
}

#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
[[noreturn]] void throwException() { throw TestFailureException(); }
[[noreturn]] void throwException() { throw TestFailureException(); } // NOLINT(cert-err60-cpp)
#else // DOCTEST_CONFIG_NO_EXCEPTIONS
void throwException() {}
#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
Expand Down Expand Up @@ -4201,7 +4201,7 @@ namespace {
#define DOCTEST_OUTPUT_DEBUG_STRING(text) ::OutputDebugStringA(text)
#else
// TODO: integration with XCode and other IDEs
#define DOCTEST_OUTPUT_DEBUG_STRING(text)
#define DOCTEST_OUTPUT_DEBUG_STRING(text) // NOLINT(clang-diagnostic-unused-macros)
#endif // Platform

void addAssert(assertType::Enum at) {
Expand Down
6 changes: 3 additions & 3 deletions doctest/parts/doctest.cpp
Expand Up @@ -242,7 +242,7 @@ namespace detail {
return oss.str().c_str();
}

DOCTEST_THREAD_LOCAL std::ostringstream g_oss;
DOCTEST_THREAD_LOCAL std::ostringstream g_oss; // NOLINT(cert-err58-cpp)

std::ostream* getTlsOss() {
g_oss.clear(); // there shouldn't be anything worth clearing in the flags
Expand Down Expand Up @@ -837,7 +837,7 @@ namespace detail {
}

#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
[[noreturn]] void throwException() { throw TestFailureException(); }
[[noreturn]] void throwException() { throw TestFailureException(); } // NOLINT(cert-err60-cpp)
#else // DOCTEST_CONFIG_NO_EXCEPTIONS
void throwException() {}
#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
Expand Down Expand Up @@ -1504,7 +1504,7 @@ namespace {
#define DOCTEST_OUTPUT_DEBUG_STRING(text) ::OutputDebugStringA(text)
#else
// TODO: integration with XCode and other IDEs
#define DOCTEST_OUTPUT_DEBUG_STRING(text)
#define DOCTEST_OUTPUT_DEBUG_STRING(text) // NOLINT(clang-diagnostic-unused-macros)
#endif // Platform

void addAssert(assertType::Enum at) {
Expand Down
2 changes: 1 addition & 1 deletion doctest/parts/doctest_fwd.h
Expand Up @@ -397,7 +397,7 @@ DOCTEST_GCC_SUPPRESS_WARNING_POP
// Forward declaring 'X' in namespace std is not permitted by the C++ Standard.
DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4643)

DOCTEST_STD_NAMESPACE_BEGIN
DOCTEST_STD_NAMESPACE_BEGIN // NOLINT (cert-dcl58-cpp)
typedef decltype(nullptr) nullptr_t;
template <class charT>
struct char_traits;
Expand Down

0 comments on commit 9260898

Please sign in to comment.