From 527a84a467c27080bf28514b85a8ff44bf5ca3c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Moisan?= Date: Tue, 25 Mar 2014 15:42:07 -0400 Subject: [PATCH] fix coding style deviations --- README.md | 2 +- include/internal/catch_config.hpp | 3 +-- include/internal/catch_interfaces_config.h | 4 ++-- include/internal/catch_runner_impl.hpp | 6 ++---- include/internal/catch_version.hpp | 2 +- single_include/catch.hpp | 15 ++++++--------- 6 files changed, 13 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 1f7c9e68..f2807e59 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![catch logo](catch-logo-small.png) -*v1.0 build 33 (master branch)* +*v1.0 build 34 (master branch)* Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch) diff --git a/include/internal/catch_config.hpp b/include/internal/catch_config.hpp index b418020d..4a708f78 100644 --- a/include/internal/catch_config.hpp +++ b/include/internal/catch_config.hpp @@ -157,8 +157,7 @@ namespace Catch { return m_userHooks; } - void addUserHook(ITestCaseHook* hook) - { + void addUserHook(ITestCaseHook* hook) { m_userHooks.push_back(hook); } diff --git a/include/internal/catch_interfaces_config.h b/include/internal/catch_interfaces_config.h index e6266dcb..664ebb83 100644 --- a/include/internal/catch_interfaces_config.h +++ b/include/internal/catch_interfaces_config.h @@ -35,8 +35,8 @@ namespace Catch { Never }; }; - struct ITestCaseHook - { + struct ITestCaseHook { + virtual ~ITestCaseHook() {} virtual void sectionStarting(TestCaseInfo const & testCaseInfo) = 0; diff --git a/include/internal/catch_runner_impl.hpp b/include/internal/catch_runner_impl.hpp index 64768ece..5bbe3de0 100644 --- a/include/internal/catch_runner_impl.hpp +++ b/include/internal/catch_runner_impl.hpp @@ -256,8 +256,7 @@ namespace Catch { return action; } - void runTestCaseStartingHook(TestCaseInfo const& testCaseInfo) - { + void runTestCaseStartingHook(TestCaseInfo const& testCaseInfo) { std::vector const & validations = m_config->userTestCaseHooks(); for(std::vector::const_iterator it = validations.begin(), end = validations.end(); it != end; ++it) @@ -266,8 +265,7 @@ namespace Catch { } } - void runTestCaseEndingHook(TestCaseInfo const& testCaseInfo) - { + void runTestCaseEndingHook(TestCaseInfo const& testCaseInfo) { std::vector const & validations = m_config->userTestCaseHooks(); for(std::vector::const_reverse_iterator it = validations.rbegin(), end = validations.rend(); it != end; ++it) diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index ef1d2371..72b166dc 100644 --- a/include/internal/catch_version.hpp +++ b/include/internal/catch_version.hpp @@ -13,7 +13,7 @@ namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 1, 0, 33, "master" ); + Version libraryVersion( 1, 0, 34, "master" ); } #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED diff --git a/single_include/catch.hpp b/single_include/catch.hpp index ffb4d52a..80c19569 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* * CATCH v1.0 build 34 (master branch) - * Generated: 2014-03-25 14:43:34.962000 + * Generated: 2014-03-25 15:40:48.212000 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -1520,8 +1520,8 @@ namespace Catch { Never }; }; - struct ITestCaseHook - { + struct ITestCaseHook { + virtual ~ITestCaseHook() {} virtual void sectionStarting(TestCaseInfo const & testCaseInfo) = 0; @@ -3010,8 +3010,7 @@ namespace Catch { return m_userHooks; } - void addUserHook(ITestCaseHook* hook) - { + void addUserHook(ITestCaseHook* hook) { m_userHooks.push_back(hook); } @@ -5047,8 +5046,7 @@ namespace Catch { return action; } - void runTestCaseStartingHook(TestCaseInfo const& testCaseInfo) - { + void runTestCaseStartingHook(TestCaseInfo const& testCaseInfo) { std::vector const & validations = m_config->userTestCaseHooks(); for(std::vector::const_iterator it = validations.begin(), end = validations.end(); it != end; ++it) @@ -5057,8 +5055,7 @@ namespace Catch { } } - void runTestCaseEndingHook(TestCaseInfo const& testCaseInfo) - { + void runTestCaseEndingHook(TestCaseInfo const& testCaseInfo) { std::vector const & validations = m_config->userTestCaseHooks(); for(std::vector::const_reverse_iterator it = validations.rbegin(), end = validations.rend(); it != end; ++it)