diff options
| author | Igor Murashkin <iam@google.com> | 2019-02-20 17:14:45 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-20 17:14:45 -0800 |
| commit | c6ee6b26d930e1e139d9ab2e0b1706d25a109543 (patch) | |
| tree | 30696c133fbbe4ac173b40626b1515929dc7ced6 /Rx/v2/examples/doxygen/flat_map.cpp | |
| parent | 8d75c301b1ce13e984405d595c5c6168e7e8cd86 (diff) | |
| parent | 6cce4d0f33aef9dab02d697d26219eccc57100d0 (diff) | |
| download | RxCpp-c6ee6b26d930e1e139d9ab2e0b1706d25a109543.tar.gz | |
android: Merge branch 'upstream-master' into master am: bf1edc83fb am: 7db9c5ce02
am: 6cce4d0f33
Change-Id: Idb7ab1e6972d67e51f939e728e5719a18646812c
Diffstat (limited to 'Rx/v2/examples/doxygen/flat_map.cpp')
| -rw-r--r-- | Rx/v2/examples/doxygen/flat_map.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Rx/v2/examples/doxygen/flat_map.cpp b/Rx/v2/examples/doxygen/flat_map.cpp index 0c88cbe..3e0a09f 100644 --- a/Rx/v2/examples/doxygen/flat_map.cpp +++ b/Rx/v2/examples/doxygen/flat_map.cpp @@ -22,7 +22,7 @@ SCENARIO("flat_map sample"){ printf("//! [flat_map sample]\n"); } -std::string get_pid(); +#include "main.hpp" SCENARIO("threaded flat_map sample"){ printf("//! [threaded flat_map sample]\n"); |