docs/benchmarks.md

@@ -189,17 +189,19 @@ construct and destroy objects without dynamic allocation and in a way that lets
 you measure construction and destruction separately.
 
 ```c++
-BENCHMARK_ADVANCED("construct")(Catch::Benchmark::Chronometer meter) {
+BENCHMARK_ADVANCED("construct")(Catch::Benchmark::Chronometer meter)
+{
     std::vector<Catch::Benchmark::storage_for<std::string>> storage(meter.runs());
     meter.measure([&](int i) { storage[i].construct("thing"); });
-};
+})
 
-BENCHMARK_ADVANCED("destroy")(Catch::Benchmark::Chronometer meter) {
+BENCHMARK_ADVANCED("destroy", [](Catch::Benchmark::Chronometer meter)
+{
     std::vector<Catch::Benchmark::destructable_object<std::string>> storage(meter.runs());
     for(auto&& o : storage)
         o.construct("thing");
     meter.measure([&](int i) { storage[i].destruct(); });
-};
+})
 ```
 
 `Catch::Benchmark::storage_for<T>` objects are just pieces of raw storage suitable for `T`

include/internal/benchmark/catch_constructor.hpp

@@ -14,7 +14,6 @@
 #include <type_traits>
 
 namespace Catch {
-    namespace Benchmark {
     namespace Detail {
         template <typename T, bool Destruct>
         struct ObjectStorage
@@ -70,6 +69,5 @@ namespace Catch {
     template <typename T>
     using destructable_object = Detail::ObjectStorage<T, false>;
 }
-}
 
 #endif // TWOBLUECUBES_CATCH_CONSTRUCTOR_HPP_INCLUDED

projects/SelfTest/UsageTests/Benchmark.tests.cpp

@@ -126,19 +126,5 @@ TEST_CASE("Benchmark containers", "[!benchmark]") {
             REQUIRE(v[i] == generated);
         }
     }
-
-    SECTION("construct and destroy example") {
-        BENCHMARK_ADVANCED("construct")(Catch::Benchmark::Chronometer meter) {
-            std::vector<Catch::Benchmark::storage_for<std::string>> storage(meter.runs());
-            meter.measure([&](int i) { storage[i].construct("thing"); });
-        };
-
-        BENCHMARK_ADVANCED("destroy")(Catch::Benchmark::Chronometer meter) {
-            std::vector<Catch::Benchmark::destructable_object<std::string>> storage(meter.runs());
-            for(auto&& o : storage)
-                o.construct("thing");
-            meter.measure([&](int i) { storage[i].destruct(); });
-        };
-    }
 }
 #endif // CATCH_CONFIG_ENABLE_BENCHMARKING

scripts/generateSingleHeader.py

@@ -23,7 +23,6 @@ def generate(v):
     blankParser = re.compile( r'^\s*$')
 
     seenHeaders = set([])
-    possibleHeaders = set([])
     rootPath = os.path.join( catchPath, 'include/' )
     outputPath = os.path.join( catchPath, 'single_include/catch2/catch.hpp' )
 
@@ -53,20 +52,8 @@ def generate(v):
         if globals['includeImpl'] or globals['implIfDefs'] == -1:
             out.write( line )
 
-    def getDirsToSearch( ):
-        return [os.path.join( rootPath, s) for s in ['', 'internal', 'reporters', 'internal/benchmark', 'internal/benchmark/detail']]
-
-    def collectPossibleHeaders():
-        dirs = getDirsToSearch()
-        for dir in dirs:
-            hpps = glob(os.path.join(dir, '*.hpp'))
-            hs = glob(os.path.join(dir, '*.h'))
-            possibleHeaders.update( hpp.rpartition( os.sep )[2] for hpp in hpps )
-            possibleHeaders.update( h.rpartition( os.sep )[2] for h in hs )
-
-
     def insertCpps():
-        dirs = getDirsToSearch()
+        dirs = [os.path.join( rootPath, s) for s in ['', 'internal', 'reporters', 'internal/benchmark', 'internal/benchmark/detail']]
         cppFiles = []
         for dir in dirs:
             cppFiles += glob(os.path.join(dir, '*.cpp'))
@@ -116,13 +103,6 @@ def generate(v):
                         write( line.rstrip() + "\n" )
         write( u'// end {}\n'.format(filename) )
 
-    def warnUnparsedHeaders():
-        unparsedHeaders = possibleHeaders.difference( seenHeaders )
-        # These headers aren't packaged into the unified header, exclude them from any warning
-        whitelist = ['catch.hpp', 'catch_reporter_teamcity.hpp', 'catch_with_main.hpp', 'catch_reporter_automake.hpp', 'catch_reporter_tap.hpp', 'catch_reporter_sonarqube.hpp']
-        unparsedHeaders = unparsedHeaders.difference( whitelist )
-        if unparsedHeaders:
-            print( "WARNING: unparsed headers detected\n{0}\n".format( unparsedHeaders ) )
 
     write( u"/*\n" )
     write( u" *  Catch v{0}\n".format( v.getVersionString() ) )
@@ -137,9 +117,7 @@ def generate(v):
     write( u"#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED\n" )
     write( u"#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED\n" )
 
-    collectPossibleHeaders()
     parseFile( rootPath, 'catch.hpp' )
-    warnUnparsedHeaders()
 
     write( u"#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED\n\n" )
     out.close()