Builds almost completely cleanly with -WEverything in LLVM

projects/SelfTest/ExceptionTests.cpp

@@ -1,15 +1,13 @@
 /*
- *  ExceptionTests.cpp
- *  Catch - Test
- *
  *  Created by Phil on 09/11/2010.
  *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
  *
  *  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)
- *
  */
 
+#pragma clang diagnostic ignored "-Wpadded"
+
 #include "catch.hpp"
 
 #include <string>
@@ -19,7 +17,7 @@
 
 namespace
 {
-    ATTRIBUTE_NORETURN
+    CATCH_ATTRIBUTE_NORETURN
     int thisThrows();
     
     int thisThrows()
@@ -41,6 +39,7 @@ TEST_CASE( "./succeeding/exceptions/explicit", "When checked exceptions are thro
     REQUIRE_THROWS( thisThrows() );
 }
 
+CATCH_ATTRIBUTE_NORETURN
 TEST_CASE( "./failing/exceptions/explicit", "When checked exceptions are thrown they can be expected or unexpected" )
 {
     CHECK_THROWS_AS( thisThrows(), std::string );