diff options
author | Igor Murashkin <iam@google.com> | 2019-02-20 16:23:27 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-02-20 16:23:27 -0800 |
commit | 7db9c5ce026d0582a1fb0ce26f2ef151fe7af2de (patch) | |
tree | 30696c133fbbe4ac173b40626b1515929dc7ced6 /Rx/v2/examples/doxygen/from.cpp | |
parent | 87fa2a6f5805cc536dec076a0cf88da73fca5dd5 (diff) | |
parent | bf1edc83fbbcb99293c1ef12d1c057dd38577914 (diff) | |
download | RxCpp-7db9c5ce026d0582a1fb0ce26f2ef151fe7af2de.tar.gz |
android: Merge branch 'upstream-master' into master
am: bf1edc83fb
Change-Id: Iacc8716fc9e9d6dcbaffe0c3d1b789d9a449cf5f
Diffstat (limited to 'Rx/v2/examples/doxygen/from.cpp')
-rw-r--r-- | Rx/v2/examples/doxygen/from.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Rx/v2/examples/doxygen/from.cpp b/Rx/v2/examples/doxygen/from.cpp index 15186ba..7cc2276 100644 --- a/Rx/v2/examples/doxygen/from.cpp +++ b/Rx/v2/examples/doxygen/from.cpp @@ -13,7 +13,7 @@ SCENARIO("from sample"){ printf("//! [from sample]\n"); } -std::string get_pid(); +#include "main.hpp" SCENARIO("threaded from sample"){ printf("//! [threaded from sample]\n"); |