Merge remote-tracking branch 'upstream/master'

docs/command-line.md

@@ -10,6 +10,8 @@ Note that options are described according to the following pattern:
 <a href="#output">   `    -o, --out`</a><br />
 <a href="#name">     `    -n, --name`</a><br />
 <a href="#nothrow">  `    -e, --nothrow`</a><br />
+<a href="#warn">     `    -w, --warn`</a><br />
+<a href="#reporting-timings">`    -d, --durations`</a><br />
 <a href="#usage">    `    -h, -?, --help`</a><br />
 
 <a id="test"></a>
@@ -126,6 +128,20 @@ These can be a nuisance in certain debugging environments that may break when ex
 
 When running with this option any throw checking assertions are skipped so as not to contribute additional noise. Be careful if this affects the behaviour of subsequent tests.
 
+<a id="warn"></a>
+## Warnings
+<pre>-w, --warn &lt;warning name></pre>
+
+Enables reporting of warnings (only one, at time of this writing). If a warning is issued it fails the test.
+
+The ony available warning, presently, is ```NoAssertions```. This warning fails a test case, or (leaf) section if no assertions (```REQUIRE```/ ```CHECK``` etc) are encountered.
+
+<a id="reporting-timings"></a>
+## Reporting timings
+<pre>-d, --durations &lt;yes/no></pre>
+
+When set to ```yes``` Catch will report the duration of each test case, in milliseconds. Note that it does this regardless of whether a test case passes or fails. Note, also, the certain reporters (e.g. Junit) always report test case durations regardless of this option being set or not.
+
 <a id="usage"></a>
 ## Usage
 <pre>-h, -?, --help</pre>

include/internal/catch_tostring.hpp

@@ -14,6 +14,7 @@
 #include <sstream>
 #include <iomanip>
 #include <limits>
+#include <vector>
 
 #ifdef __OBJC__
 #include "catch_objc_arc.hpp"