Cleaned up -Wpadded warning handling a bit more

This commit is contained in:
Phil Nash 2013-03-13 08:18:30 +00:00
parent dc2735c23d
commit 0db35c0f35
5 changed files with 9 additions and 16 deletions

View File

@ -6,10 +6,6 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#ifdef __clang__
#pragma clang diagnostic ignored "-Wpadded"
#endif
#include "catch.hpp" #include "catch.hpp"
#include <string> #include <string>

View File

@ -6,10 +6,6 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#ifdef __clang__
#pragma clang diagnostic ignored "-Wpadded"
#endif
#include "catch.hpp" #include "catch.hpp"
#include "catch_self_test.hpp" #include "catch_self_test.hpp"

View File

@ -6,10 +6,6 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#ifdef __clang__
#pragma clang diagnostic ignored "-Wpadded"
#endif
#define CATCH_CONFIG_MAIN #define CATCH_CONFIG_MAIN
#include "catch_self_test.hpp" #include "catch_self_test.hpp"

View File

@ -18,6 +18,11 @@
#include "set" #include "set"
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpadded"
#endif
namespace Catch { namespace Catch {
class NullStreamingReporter : public SharedImpl<IStreamingReporter> { class NullStreamingReporter : public SharedImpl<IStreamingReporter> {
@ -162,6 +167,10 @@ namespace Catch {
} }
#ifdef __clang__
#pragma clang diagnostic pop
#endif
#define CATCH_REGISTER_LINE_INFO( name ) ::Catch::LineInfoRegistrar INTERNAL_CATCH_UNIQUE_NAME( lineRegistrar )( name, ::Catch::SourceLineInfo( __FILE__, __LINE__ ) ); #define CATCH_REGISTER_LINE_INFO( name ) ::Catch::LineInfoRegistrar INTERNAL_CATCH_UNIQUE_NAME( lineRegistrar )( name, ::Catch::SourceLineInfo( __FILE__, __LINE__ ) );
#define CATCH_GET_LINE_INFO( name ) ::Catch::LineInfoRegistry::get().infoForName( name ) #define CATCH_GET_LINE_INFO( name ) ::Catch::LineInfoRegistry::get().infoForName( name )

View File

@ -6,10 +6,6 @@
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#ifdef __clang__
#pragma clang diagnostic ignored "-Wpadded"
#endif
#include "catch.hpp" #include "catch.hpp"
// !TBD: story scenarios map to class based tests // !TBD: story scenarios map to class based tests