merge from upstream

This commit is contained in:
Malcolm Noyes
2013-12-11 20:57:42 +00:00
9 changed files with 51 additions and 71 deletions

View File

@@ -57,16 +57,6 @@ namespace Catch {
delete it->second;
}
template<typename ContainerT, typename Function>
inline void forEach( ContainerT& container, Function function ) {
std::for_each( container.begin(), container.end(), function );
}
template<typename ContainerT, typename Function>
inline void forEach( ContainerT const& container, Function function ) {
std::for_each( container.begin(), container.end(), function );
}
bool startsWith( std::string const& s, std::string const& prefix );
bool endsWith( std::string const& s, std::string const& suffix );
bool contains( std::string const& s, std::string const& infix );

View File

@@ -43,7 +43,7 @@ namespace Catch{
#endif
#ifndef CATCH_BREAK_INTO_DEBUGGER
#define CATCH_BREAK_INTO_DEBUGGER()
#define CATCH_BREAK_INTO_DEBUGGER() Catch::isTrue( true );
#endif
#endif // TWOBLUECUBES_CATCH_DEBUGGER_H_INCLUDED

View File

@@ -14,7 +14,7 @@ namespace Catch {
// These numbers are maintained by a script
template <typename T>
const T LibraryVersionInfo<T>::value( 1, 0, 16, "master" );
const T LibraryVersionInfo<T>::value( 1, 0, 17, "master" );
}
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED