Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorMickey Rose2017-03-15 13:38:19 +0100
committerPhil Nash2017-03-15 15:19:38 +0000
commit4dc06bdb7034d36071caa2219f14c4b2ce52c80a (patch)
tree26e013e2f8f4bc1393e9c51b64cfc57b303f9062 /include
parent08b597b3e2ac3ceb942a52a5f8432474add3cc64 (diff)
downloadcatch3-4dc06bdb7034d36071caa2219f14c4b2ce52c80a.tar.gz
Use bulk vector::insert rather than back_inserter
Diffstat (limited to 'include')
-rw-r--r--include/internal/catch_generators.hpp3
-rw-r--r--include/internal/catch_test_case_tracker.hpp7
2 files changed, 4 insertions, 6 deletions
diff --git a/include/internal/catch_generators.hpp b/include/internal/catch_generators.hpp
index 84eb22f7..a9ba7eb8 100644
--- a/include/internal/catch_generators.hpp
+++ b/include/internal/catch_generators.hpp
@@ -10,7 +10,6 @@
#include "catch_context.h"
-#include <iterator>
#include <vector>
#include <string>
#include <stdlib.h>
@@ -124,7 +123,7 @@ public:
private:
void move( CompositeGenerator& other ) {
- std::copy( other.m_composed.begin(), other.m_composed.end(), std::back_inserter( m_composed ) );
+ m_composed.insert( m_composed.end(), other.m_composed.begin(), other.m_composed.end() );
m_totalSize += other.m_totalSize;
other.m_composed.clear();
}
diff --git a/include/internal/catch_test_case_tracker.hpp b/include/internal/catch_test_case_tracker.hpp
index 9526e281..f1ab0feb 100644
--- a/include/internal/catch_test_case_tracker.hpp
+++ b/include/internal/catch_test_case_tracker.hpp
@@ -11,11 +11,10 @@
#include "catch_compiler_capabilities.h"
#include "catch_ptr.hpp"
-#include <map>
+#include <algorithm>
#include <string>
#include <assert.h>
#include <vector>
-#include <iterator>
#include <stdexcept>
namespace Catch {
@@ -290,12 +289,12 @@ namespace TestCaseTracking {
if( !filters.empty() ) {
m_filters.push_back(""); // Root - should never be consulted
m_filters.push_back(""); // Test Case - not a section filter
- std::copy( filters.begin(), filters.end(), std::back_inserter( m_filters ) );
+ m_filters.insert( m_filters.end(), filters.begin(), filters.end() );
}
}
void addNextFilters( std::vector<std::string> const& filters ) {
if( filters.size() > 1 )
- std::copy( filters.begin()+1, filters.end(), std::back_inserter( m_filters ) );
+ m_filters.insert( m_filters.end(), ++filters.begin(), filters.end() );
}
};