From 815e92158e3e0647b96d1331de1ecc5badcde3f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kodovsk=C3=BD?= Date: Sat, 9 Dec 2017 22:39:51 +0100 Subject: Add rx-merge-delay-error operator (#417) * Add rx-merge-delay-error operator * fix of msvc2013 compilation * fix #417 comments Added RXCPP_NOEXCEPT macro; Added doxygen scenarios for composite_exception and merge_delay_error; Fixed composing exception in merge_delay_error operator; Modified test for merge_delay_operator * #417 fix composite_exception example * #417 fix merge_delay_error doxygen example * fix: samples add among others in project doxygen CMakeLists.txt * fix: composite_exception.cpp example --- projects/doxygen/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'projects') diff --git a/projects/doxygen/CMakeLists.txt b/projects/doxygen/CMakeLists.txt index f5e66c4..a3fcd36 100644 --- a/projects/doxygen/CMakeLists.txt +++ b/projects/doxygen/CMakeLists.txt @@ -49,6 +49,7 @@ if(DOXYGEN_FOUND) ${DOXY_EXAMPLES_SRC_DIR}/blocking_observable.cpp ${DOXY_EXAMPLES_SRC_DIR}/buffer.cpp ${DOXY_EXAMPLES_SRC_DIR}/combine_latest.cpp + ${DOXY_EXAMPLES_SRC_DIR}/composite_exception.cpp ${DOXY_EXAMPLES_SRC_DIR}/concat.cpp ${DOXY_EXAMPLES_SRC_DIR}/concat_map.cpp ${DOXY_EXAMPLES_SRC_DIR}/contains.cpp @@ -75,6 +76,7 @@ if(DOXYGEN_FOUND) ${DOXY_EXAMPLES_SRC_DIR}/map.cpp ${DOXY_EXAMPLES_SRC_DIR}/math.cpp ${DOXY_EXAMPLES_SRC_DIR}/merge.cpp + ${DOXY_EXAMPLES_SRC_DIR}/merge_delay_error.cpp ${DOXY_EXAMPLES_SRC_DIR}/never.cpp ${DOXY_EXAMPLES_SRC_DIR}/observe_on.cpp ${DOXY_EXAMPLES_SRC_DIR}/on_error_resume_next.cpp -- cgit v1.2.3