diff options
| author | Igor Murashkin <iam@google.com> | 2019-02-20 13:52:07 -0800 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2019-02-20 13:52:07 -0800 |
| commit | bf1edc83fbbcb99293c1ef12d1c057dd38577914 (patch) | |
| tree | 30696c133fbbe4ac173b40626b1515929dc7ced6 /Rx/v2/examples/doxygen/concat_map.cpp | |
| parent | 2f3177dd770845c830419ef07b1b90a5a24d0649 (diff) | |
| parent | aac2fc97bc5fe680446afb5ae81bef0a9c0fbf8a (diff) | |
| download | RxCpp-bf1edc83fbbcb99293c1ef12d1c057dd38577914.tar.gz | |
android: Merge branch 'upstream-master' into master
Updates to aac2fc97bc5fe680446afb5ae81bef0a9c0fbf8a in upstream.
Change-Id: Ic56ec9d83b5611e734dfdbebec7c3538388f5c82
Diffstat (limited to 'Rx/v2/examples/doxygen/concat_map.cpp')
| -rw-r--r-- | Rx/v2/examples/doxygen/concat_map.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Rx/v2/examples/doxygen/concat_map.cpp b/Rx/v2/examples/doxygen/concat_map.cpp index 957665f..a087431 100644 --- a/Rx/v2/examples/doxygen/concat_map.cpp +++ b/Rx/v2/examples/doxygen/concat_map.cpp @@ -22,7 +22,7 @@ SCENARIO("concat_map sample"){ printf("//! [concat_map sample]\n"); } -std::string get_pid(); +#include "main.hpp" SCENARIO("threaded concat_map sample"){ printf("//! [threaded concat_map sample]\n"); |