diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-03 21:50:12 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-03 21:50:12 -0800 |
| commit | 4c91abd6a020ee030114ae3f22d8f6066e7528be (patch) | |
| tree | 9f76256eabe4900a7eef6cbb94b7ed2378b93f48 /src/compat/option_test.cpp | |
| parent | 0a202555d2e12866b3619af92f50cb38ea4adb12 (diff) | |
| parent | 711680d652a8db17c1b91428b6d6835f30dfb4fd (diff) | |
| download | tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.tar.gz tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.tar.bz2 tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.tar.xz tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.zip | |
Merge remote-tracking branch 'origin/hotfix'
Conflicts:
src/map/chrif.cpp
Diffstat (limited to 'src/compat/option_test.cpp')
| -rw-r--r-- | src/compat/option_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compat/option_test.cpp b/src/compat/option_test.cpp index ac95424..f9cec0e 100644 --- a/src/compat/option_test.cpp +++ b/src/compat/option_test.cpp @@ -398,7 +398,7 @@ TEST(Option, unwrap) v = None; TRY_UNWRAP(fcr(), v = Some(1)); v = None; - if OPTION_IS_SOME(o, v) + if OPTION_IS_SOME_NOLOOP(o, v) { EXPECT_NE(o, o); } @@ -408,7 +408,7 @@ TEST(Option, unwrap) } v = Some(1); - if OPTION_IS_SOME(o, v) + if OPTION_IS_SOME_NOLOOP(o, v) { EXPECT_EQ(o, 1); } |