summaryrefslogtreecommitdiff
path: root/Rx/v2/examples/doxygen/skip_until.cpp
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2019-02-20 16:23:27 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-02-20 16:23:27 -0800
commit7db9c5ce026d0582a1fb0ce26f2ef151fe7af2de (patch)
tree30696c133fbbe4ac173b40626b1515929dc7ced6 /Rx/v2/examples/doxygen/skip_until.cpp
parent87fa2a6f5805cc536dec076a0cf88da73fca5dd5 (diff)
parentbf1edc83fbbcb99293c1ef12d1c057dd38577914 (diff)
downloadRxCpp-7db9c5ce026d0582a1fb0ce26f2ef151fe7af2de.tar.gz
android: Merge branch 'upstream-master' into master
am: bf1edc83fb Change-Id: Iacc8716fc9e9d6dcbaffe0c3d1b789d9a449cf5f
Diffstat (limited to 'Rx/v2/examples/doxygen/skip_until.cpp')
-rw-r--r--Rx/v2/examples/doxygen/skip_until.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Rx/v2/examples/doxygen/skip_until.cpp b/Rx/v2/examples/doxygen/skip_until.cpp
index c539d8e..d99cb6e 100644
--- a/Rx/v2/examples/doxygen/skip_until.cpp
+++ b/Rx/v2/examples/doxygen/skip_until.cpp
@@ -15,7 +15,7 @@ SCENARIO("skip_until sample"){
printf("//! [skip_until sample]\n");
}
-std::string get_pid();
+#include "main.hpp"
SCENARIO("threaded skip_until sample"){
printf("//! [threaded skip_until sample]\n");