diff options
| author | Phil Nash | 2012-09-28 19:21:14 +0100 |
|---|---|---|
| committer | Phil Nash | 2012-09-28 19:21:14 +0100 |
| commit | 4b93fb81b5e9d2069c49f170ffe4d98b239b5920 (patch) | |
| tree | 9da1a74f3f5eeb29fef6bcb6a189109ecde971c0 /include | |
| parent | 67ec8709eae23dfb4fe30f789fd788d5a9c77ea8 (diff) | |
| download | catch3-4b93fb81b5e9d2069c49f170ffe4d98b239b5920.tar.gz | |
Added some surrogate cpps
(and fixed up missing includes they uncovered)
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/catch_context.h | 5 | ||||
| -rw-r--r-- | include/internal/catch_interfaces_capture.h | 1 | ||||
| -rw-r--r-- | include/internal/catch_stream.hpp | 3 | ||||
| -rw-r--r-- | include/internal/catch_streambuf.h | 21 | ||||
| -rw-r--r-- | include/internal/catch_totals.hpp | 2 | ||||
| -rw-r--r-- | include/internal/catch_xmlwriter.hpp | 1 |
6 files changed, 28 insertions, 5 deletions
diff --git a/include/internal/catch_context.h b/include/internal/catch_context.h index 62b867ef..51716733 100644 --- a/include/internal/catch_context.h +++ b/include/internal/catch_context.h @@ -23,11 +23,6 @@ namespace Catch { struct IGeneratorsForTest; struct IConfig; - class StreamBufBase : public std::streambuf { - public: - virtual ~StreamBufBase(); - }; - struct IContext { virtual ~IContext(); diff --git a/include/internal/catch_interfaces_capture.h b/include/internal/catch_interfaces_capture.h index c50d914b..07b5ccd9 100644 --- a/include/internal/catch_interfaces_capture.h +++ b/include/internal/catch_interfaces_capture.h @@ -11,6 +11,7 @@ #include <string> #include "catch_result_type.h" #include "catch_totals.hpp" +#include "catch_common.h" namespace Catch { diff --git a/include/internal/catch_stream.hpp b/include/internal/catch_stream.hpp index ee0890b8..92d3310b 100644 --- a/include/internal/catch_stream.hpp +++ b/include/internal/catch_stream.hpp @@ -9,6 +9,9 @@ #ifndef TWOBLUECUBES_CATCH_STREAM_HPP_INCLUDED #define TWOBLUECUBES_CATCH_STREAM_HPP_INCLUDED +#include "catch_streambuf.h" +#include "catch_debugger.hpp" + #include <stdexcept> #include <cstdio> diff --git a/include/internal/catch_streambuf.h b/include/internal/catch_streambuf.h new file mode 100644 index 00000000..18b94ccb --- /dev/null +++ b/include/internal/catch_streambuf.h @@ -0,0 +1,21 @@ +/* + * Created by Phil on 27/11/2012. + * Copyright 2012 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) + */ +#ifndef TWOBLUECUBES_CATCH_STREAMBUF_H_INCLUDED +#define TWOBLUECUBES_CATCH_STREAMBUF_H_INCLUDED + +#include <streambuf> + +namespace Catch { + + class StreamBufBase : public std::streambuf { + public: + virtual ~StreamBufBase(); + }; +} + +#endif // TWOBLUECUBES_CATCH_STREAMBUF_H_INCLUDED diff --git a/include/internal/catch_totals.hpp b/include/internal/catch_totals.hpp index 8940d0fc..03832a2e 100644 --- a/include/internal/catch_totals.hpp +++ b/include/internal/catch_totals.hpp @@ -8,6 +8,8 @@ #ifndef TWOBLUECUBES_CATCH_TOTALS_HPP_INCLUDED #define TWOBLUECUBES_CATCH_TOTALS_HPP_INCLUDED +#include <cstddef> + namespace Catch { struct Counts { diff --git a/include/internal/catch_xmlwriter.hpp b/include/internal/catch_xmlwriter.hpp index 57494d2e..f929f601 100644 --- a/include/internal/catch_xmlwriter.hpp +++ b/include/internal/catch_xmlwriter.hpp @@ -9,6 +9,7 @@ #define TWOBLUECUBES_CATCH_XMLWRITER_HPP_INCLUDED #include <sstream> +#include <iostream> #include <string> #include <vector> |