summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-07-07 02:18:38 +0300
committerAndrei Karas <akaras@inbox.ru>2017-07-07 03:34:13 +0300
commitc5c7ca3779e3246b7972b37f29a34d51b9526fae (patch)
tree05c4fc9448e6550235b1edc22e4a670091a1b1ff /src/test
parentec26c1bfa3d664d3f66d2f15db81dec23cb58800 (diff)
downloadmv-c5c7ca3779e3246b7972b37f29a34d51b9526fae.tar.gz
mv-c5c7ca3779e3246b7972b37f29a34d51b9526fae.tar.bz2
mv-c5c7ca3779e3246b7972b37f29a34d51b9526fae.tar.xz
mv-c5c7ca3779e3246b7972b37f29a34d51b9526fae.zip
Update to latest doctest version from git.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/doctest.h54
1 files changed, 52 insertions, 2 deletions
diff --git a/src/test/doctest.h b/src/test/doctest.h
index e6567a7ec..695c271b5 100644
--- a/src/test/doctest.h
+++ b/src/test/doctest.h
@@ -103,8 +103,8 @@
#define DOCTEST_VERSION_MAJOR 1
#define DOCTEST_VERSION_MINOR 2
-#define DOCTEST_VERSION_PATCH 0
-#define DOCTEST_VERSION_STR "1.2.0"
+#define DOCTEST_VERSION_PATCH 1
+#define DOCTEST_VERSION_STR "1.2.1"
#define DOCTEST_VERSION \
(DOCTEST_VERSION_MAJOR * 10000 + DOCTEST_VERSION_MINOR * 100 + DOCTEST_VERSION_PATCH)
@@ -1799,6 +1799,30 @@ namespace detail
StringStream<T>::convert(stream, value);
}
+#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+ DOCTEST_INTERFACE void toStream(std::ostream* stream, char* in);
+ DOCTEST_INTERFACE void toStream(std::ostream* stream, const char* in);
+#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+ DOCTEST_INTERFACE void toStream(std::ostream* stream, bool in);
+ DOCTEST_INTERFACE void toStream(std::ostream* stream, float in);
+ DOCTEST_INTERFACE void toStream(std::ostream* stream, double in);
+ DOCTEST_INTERFACE void toStream(std::ostream* stream, double long in);
+
+ DOCTEST_INTERFACE void toStream(std::ostream* stream, char in);
+ DOCTEST_INTERFACE void toStream(std::ostream* stream, char signed in);
+ DOCTEST_INTERFACE void toStream(std::ostream* stream, char unsigned in);
+ DOCTEST_INTERFACE void toStream(std::ostream* stream, int short in);
+ DOCTEST_INTERFACE void toStream(std::ostream* stream, int short unsigned in);
+ DOCTEST_INTERFACE void toStream(std::ostream* stream, int in);
+ DOCTEST_INTERFACE void toStream(std::ostream* stream, int unsigned in);
+ DOCTEST_INTERFACE void toStream(std::ostream* stream, int long in);
+ DOCTEST_INTERFACE void toStream(std::ostream* stream, int long unsigned in);
+
+#ifdef DOCTEST_CONFIG_WITH_LONG_LONG
+ DOCTEST_INTERFACE void toStream(std::ostream* stream, int long long in);
+ DOCTEST_INTERFACE void toStream(std::ostream* stream, int long long unsigned in);
+#endif // DOCTEST_CONFIG_WITH_LONG_LONG
+
struct IContextScope //!OCLINT destructor of virtual class
{ virtual void build(std::ostream*) = 0; };
@@ -4299,6 +4323,32 @@ namespace detail
void writeStringToStream(std::ostream* stream, const String& str) { *stream << str; }
+#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+ void toStream(std::ostream* stream, char* in) { *stream << in; }
+ void toStream(std::ostream* stream, const char* in) { *stream << in; }
+#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+ void toStream(std::ostream* stream, bool in) {
+ *stream << std::boolalpha << in << std::noboolalpha;
+ }
+ void toStream(std::ostream* stream, float in) { *stream << in; }
+ void toStream(std::ostream* stream, double in) { *stream << in; }
+ void toStream(std::ostream* stream, double long in) { *stream << in; }
+
+ void toStream(std::ostream* stream, char in) { *stream << in; }
+ void toStream(std::ostream* stream, char signed in) { *stream << in; }
+ void toStream(std::ostream* stream, char unsigned in) { *stream << in; }
+ void toStream(std::ostream* stream, int short in) { *stream << in; }
+ void toStream(std::ostream* stream, int short unsigned in) { *stream << in; }
+ void toStream(std::ostream* stream, int in) { *stream << in; }
+ void toStream(std::ostream* stream, int unsigned in) { *stream << in; }
+ void toStream(std::ostream* stream, int long in) { *stream << in; }
+ void toStream(std::ostream* stream, int long unsigned in) { *stream << in; }
+
+#ifdef DOCTEST_CONFIG_WITH_LONG_LONG
+ void toStream(std::ostream* stream, int long long in) { *stream << in; }
+ void toStream(std::ostream* stream, int long long unsigned in) { *stream << in; }
+#endif // DOCTEST_CONFIG_WITH_LONG_LONG
+
void addToContexts(IContextScope* ptr) { contextState->contexts.push_back(ptr); }
void popFromContexts() { contextState->contexts.pop_back(); }
void useContextIfExceptionOccurred(IContextScope* ptr) {