Merge swapping

This commit is contained in:
Simon Brand committed 2019-04-26 13:44:27 +01:00
1 parent 57a8670798
commit 3674ba5295
9 files changed
+2579 -2299

No files matched your search

+1 -1
View File
@@ -11,4 +11,4 @@ target_link_libraries(example ${CONAN_LIBS})
# enable_testing()
# add_test(NAME example
# WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin
# COMMAND example)
# COMMAND example)
+1 -1
View File
@@ -22,4 +22,4 @@ class ExpectedTestConan(ConanFile):
def test(self):
if not tools.cross_building(self.settings):
os.chdir("bin")
self.run(".%sexample" % os.sep)
self.run(".%sexample" % os.sep)
+3 -2
View File
@@ -3,7 +3,8 @@
tl::expected<int, const char*> maybe_do_something(int i) {
if (i < 5) {
return 0;
} else {
}
else {
return tl::make_unexpected("Uh oh");
}
}
@@ -12,4 +13,4 @@ int main(int argc, char** argv) {
(void)argv;
return maybe_do_something(0).value_or(-1);
}
}