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

Suppressed a load of warnings

This commit is contained in:
Phil Nash 2014-05-19 18:57:14 +01:00
parent ebd4888fe1
commit 3bdc97d8ad
26 changed files with 103 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/catch.hpp
View File

@ -9,15 +9,7 @@
#ifndef TWOBLUECUBES_CATCH_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_HPP_INCLUDED
#ifdef __clang__
#pragma clang diagnostic ignored "-Wglobal-constructors"
#pragma clang diagnostic ignored "-Wvariadic-macros"
#pragma clang diagnostic ignored "-Wc99-extensions"
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpadded"
#pragma clang diagnostic ignored "-Wc++98-compat"
#pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
#endif
#include "internal/catch_suppress_warnings.h"
#ifdef CATCH_CONFIG_MAIN
# define CATCH_CONFIG_RUNNER
@ -197,8 +189,6 @@
using Catch::Detail::Approx;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
#include "internal/catch_reenable_warnings.h"
#endif // TWOBLUECUBES_CATCH_HPP_INCLUDED

1
include/internal/catch_console_colour.hpp
View File

@ -58,6 +58,7 @@ namespace Catch {
static void use( Code _colourCode );
private:
Colour( Colour const& other );
static Detail::IColourImpl* impl();
};

1
include/internal/catch_message.h
View File

@ -55,6 +55,7 @@ namespace Catch {
class ScopedMessage {
public:
ScopedMessage( MessageBuilder const& builder );
ScopedMessage( ScopedMessage const& other );
~ScopedMessage();
MessageInfo m_info;

4
include/internal/catch_message.hpp
View File

@ -33,6 +33,10 @@ namespace Catch {
m_info.message = builder.m_stream.str();
getResultCapture().pushScopedMessage( m_info );
}
ScopedMessage::ScopedMessage( ScopedMessage const& other )
: m_info( other.m_info )
{}
ScopedMessage::~ScopedMessage() {
getResultCapture().popScopedMessage( m_info );
}

1
include/internal/catch_notimplemented_exception.h
View File

@ -17,6 +17,7 @@ namespace Catch {
{
public:
NotImplementedException( SourceLineInfo const& lineInfo );
NotImplementedException( NotImplementedException const& ) {}
virtual ~NotImplementedException() CATCH_NOEXCEPT {}

15
include/internal/catch_reenable_warnings.h Normal file
View File

@ -0,0 +1,15 @@
/*
* Copyright 2014 Two Blue Cubes Ltd
*
* Distributed under the Boost Software License, Version 1.0. (See accompanying
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/
#ifndef TWOBLUECUBES_CATCH_REENABLE_WARNINGS_H_INCLUDED
#define TWOBLUECUBES_CATCH_REENABLE_WARNINGS_H_INCLUDED
#ifdef __clang__
#pragma clang diagnostic pop
#endif
#endif // TWOBLUECUBES_CATCH_REENABLE_WARNINGS_H_INCLUDED

21
include/internal/catch_suppress_warnings.h Normal file
View File

@ -0,0 +1,21 @@
/*
* Copyright 2014 Two Blue Cubes Ltd
*
* Distributed under the Boost Software License, Version 1.0. (See accompanying
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/
#ifndef TWOBLUECUBES_CATCH_SUPPRESS_WARNINGS_H_INCLUDED
#define TWOBLUECUBES_CATCH_SUPPRESS_WARNINGS_H_INCLUDED
#ifdef __clang__
#pragma clang diagnostic ignored "-Wglobal-constructors"
#pragma clang diagnostic ignored "-Wvariadic-macros"
#pragma clang diagnostic ignored "-Wc99-extensions"
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpadded"
#pragma clang diagnostic ignored "-Wc++98-compat"
#pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
#endif
#endif // TWOBLUECUBES_CATCH_SUPPRESS_WARNINGS_H_INCLUDED

46
include/internal/catch_xmlwriter.hpp
View File

@ -66,26 +66,26 @@ namespace Catch {
endElement();
}
# ifndef CATCH_CPP11_OR_GREATER
XmlWriter& operator = ( XmlWriter const& other ) {
XmlWriter temp( other );
swap( temp );
return *this;
}
# else
XmlWriter( XmlWriter const& ) = default;
XmlWriter( XmlWriter && ) = default;
XmlWriter& operator = ( XmlWriter const& ) = default;
XmlWriter& operator = ( XmlWriter && ) = default;
# endif
void swap( XmlWriter& other ) {
std::swap( m_tagIsOpen, other.m_tagIsOpen );
std::swap( m_needsNewline, other.m_needsNewline );
std::swap( m_tags, other.m_tags );
std::swap( m_indent, other.m_indent );
std::swap( m_os, other.m_os );
}
//# ifndef CATCH_CPP11_OR_GREATER
// XmlWriter& operator = ( XmlWriter const& other ) {
// XmlWriter temp( other );
// swap( temp );
// return *this;
// }
//# else
// XmlWriter( XmlWriter const& ) = default;
// XmlWriter( XmlWriter && ) = default;
// XmlWriter& operator = ( XmlWriter const& ) = default;
// XmlWriter& operator = ( XmlWriter && ) = default;
//# endif
//
// void swap( XmlWriter& other ) {
// std::swap( m_tagIsOpen, other.m_tagIsOpen );
// std::swap( m_needsNewline, other.m_needsNewline );
// std::swap( m_tags, other.m_tags );
// std::swap( m_indent, other.m_indent );
// std::swap( m_os, other.m_os );
// }
XmlWriter& startElement( std::string const& name ) {
ensureTagClosed();
@ -163,7 +163,13 @@ namespace Catch {
return *this;
}
void setStream( std::ostream& os ) {
m_os = &os;
}
private:
XmlWriter( XmlWriter const& );
void operator=( XmlWriter const& );
std::ostream& stream() {
return *m_os;

1
include/reporters/catch_reporter_bases.hpp
View File

@ -99,7 +99,6 @@ namespace Catch {
return node->stats.sectionInfo.lineInfo == m_other.lineInfo;
}
private:
BySectionInfo& operator=( BySectionInfo const& other ); // = delete;
SectionInfo const& m_other;
};

6
include/reporters/catch_reporter_compact.hpp
View File

@ -142,7 +142,7 @@ namespace Catch {
private:
// Colour::LightGrey
static Colour dimColour() { return Colour::FileName; }
static Colour::Code dimColour() { return Colour::FileName; }
#ifdef CATCH_PLATFORM_MAC
static const char* failedString() { return "FAILED"; }
@ -157,7 +157,7 @@ namespace Catch {
stream << result.getSourceInfo() << ":";
}
void printResultType( Colour colour, std::string passOrFail ) const {
void printResultType( Colour::Code colour, std::string passOrFail ) const {
if( !passOrFail.empty() ) {
{
Colour colourGuard( colour );
@ -205,7 +205,7 @@ namespace Catch {
}
}
void printRemainingMessages( Colour colour = dimColour() ) {
void printRemainingMessages( Colour::Code colour = dimColour() ) {
if ( itMessage == messages.end() )
return;

2
include/reporters/catch_reporter_xml.hpp
View File

@ -31,7 +31,7 @@ namespace Catch {
}
virtual void StartTesting() {
m_xml = XmlWriter( m_config.stream() );
m_xml.setStream( m_config.stream() );
m_xml.startElement( "Catch" );
if( !m_config.fullConfig()->name().empty() )
m_xml.writeAttribute( "name", m_config.fullConfig()->name() );

4
projects/SelfTest/MessageTests.cpp
View File

@ -8,6 +8,10 @@
#include "catch.hpp"
#ifdef __clang__
#pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
#endif
TEST_CASE( "INFO and WARN do not abort tests", "[messages][.]" )
{
INFO( "this is a " << "message" ); // This should output the message if a failure occurs

4
projects/SelfTest/MiscTests.cpp
View File

@ -10,6 +10,10 @@
#include <iostream>
#ifdef __clang__
#pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
#endif
TEST_CASE( "random SECTION tests", "[.][sections][failing]" )
{
int a = 1;

1
projects/SelfTest/SurrogateCpps/catch_common.cpp
View File

@ -1,2 +1,3 @@
// This file is only here to verify (to the extent possible) the self sufficiency of the header
#include "catch_suppress_warnings.h"
#include "catch_common.h"

1
projects/SelfTest/SurrogateCpps/catch_console_colour.cpp
View File

@ -1,2 +1,3 @@
// This file is only here to verify (to the extent possible) the self sufficiency of the header
#include "catch_suppress_warnings.h"
#include "catch_console_colour.hpp"

1
projects/SelfTest/SurrogateCpps/catch_interfaces_capture.cpp
View File

@ -1,2 +1,3 @@
// This file is only here to verify (to the extent possible) the self sufficiency of the header
#include "catch_suppress_warnings.h"
#include "catch_interfaces_capture.h"

1
projects/SelfTest/SurrogateCpps/catch_interfaces_config.cpp
View File

@ -1 +1,2 @@
#include "catch_suppress_warnings.h"
#include "catch_interfaces_config.h"

1
projects/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp
View File

@ -1 +1,2 @@
#include "catch_suppress_warnings.h"
#include "catch_interfaces_reporter.h"

1
projects/SelfTest/SurrogateCpps/catch_interfaces_testcase.cpp
View File

@ -1 +1,2 @@
#include "catch_suppress_warnings.h"
#include "catch_interfaces_testcase.h"

1
projects/SelfTest/SurrogateCpps/catch_message.cpp
View File

@ -1,2 +1,3 @@
// This file is only here to verify (to the extent possible) the self sufficiency of the header
#include "catch_suppress_warnings.h"
#include "catch_message.h"

1
projects/SelfTest/SurrogateCpps/catch_option.cpp
View File

@ -1,2 +1,3 @@
// This file is only here to verify (to the extent possible) the self sufficiency of the header
#include "catch_suppress_warnings.h"
#include "catch_option.hpp"

1
projects/SelfTest/SurrogateCpps/catch_ptr.cpp
View File

@ -1,2 +1,3 @@
// This file is only here to verify (to the extent possible) the self sufficiency of the header
#include "catch_suppress_warnings.h"
#include "catch_ptr.hpp"

1
projects/SelfTest/SurrogateCpps/catch_streambuf.cpp
View File

@ -1,2 +1,3 @@
// This file is only here to verify (to the extent possible) the self sufficiency of the header
#include "catch_suppress_warnings.h"
#include "catch_streambuf.h"

1
projects/SelfTest/SurrogateCpps/catch_test_spec.cpp
View File

@ -1,2 +1,3 @@
// This file is only here to verify (to the extent possible) the self sufficiency of the header
#include "catch_suppress_warnings.h"
#include "catch_test_spec.hpp"

5
projects/SelfTest/TrickyTests.cpp
View File

@ -12,6 +12,11 @@
#include "catch.hpp"
#ifdef __clang__
#pragma clang diagnostic ignored "-Wc++98-compat"
#pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
#endif
namespace Catch
{
template<>

4
projects/XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj
View File

@ -67,6 +67,8 @@
263FD06117AF8DF200988A20 /* catch_timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = catch_timer.h; sourceTree = "<group>"; };
2656C21F1925E5100040DB02 /* catch_test_spec_parser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = catch_test_spec_parser.hpp; sourceTree = "<group>"; };
2656C2201925E7330040DB02 /* catch_test_spec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = catch_test_spec.cpp; path = ../../../SelfTest/SurrogateCpps/catch_test_spec.cpp; sourceTree = "<group>"; };
2656C226192A77EF0040DB02 /* catch_suppress_warnings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = catch_suppress_warnings.h; sourceTree = "<group>"; };
2656C227192A78410040DB02 /* catch_reenable_warnings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = catch_reenable_warnings.h; sourceTree = "<group>"; };
266B06B616F3A60A004ED264 /* VariadicMacrosTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VariadicMacrosTests.cpp; path = ../../../SelfTest/VariadicMacrosTests.cpp; sourceTree = "<group>"; };
266ECD73170F3C620030D735 /* BDDTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BDDTests.cpp; path = ../../../SelfTest/BDDTests.cpp; sourceTree = "<group>"; };
266ECD8C1713614B0030D735 /* catch_legacy_reporter_adapter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = catch_legacy_reporter_adapter.hpp; sourceTree = "<group>"; };
@ -440,6 +442,8 @@
262E739A1846759000CAC268 /* catch_common.hpp */,
261488FC184D1DC10041FBEB /* catch_stream.h */,
268F47B018A93F7800D8C14F /* catch_clara.h */,
2656C226192A77EF0040DB02 /* catch_suppress_warnings.h */,
2656C227192A78410040DB02 /* catch_reenable_warnings.h */,
);
name = Infrastructure;
sourceTree = "<group>";