Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorMaxim Pimenov <m@maps.me>2018-09-18 19:18:26 +0300
committerVlad Mihaylenko <vxmihaylenko@gmail.com>2018-09-19 13:39:37 +0300
commit253168ebefc38779fb5e39a24dca07c1b991ca73 (patch)
treeb6d049f09e22fcccd5220d5909a5000e307f84c7 /base
parentbf2efe31fe88d740abf22edcb83071a78eba3296 (diff)
[base] Removed the MY_ prefix from the scope guard.
Diffstat (limited to 'base')
-rw-r--r--base/base_tests/scope_guard_test.cpp4
-rw-r--r--base/scope_guard.hpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/base/base_tests/scope_guard_test.cpp b/base/base_tests/scope_guard_test.cpp
index a3b9b8840d..0c40ddfbdc 100644
--- a/base/base_tests/scope_guard_test.cpp
+++ b/base/base_tests/scope_guard_test.cpp
@@ -13,7 +13,7 @@ UNIT_TEST(ScopeGuard)
{
{
b = false;
- MY_SCOPE_GUARD(guard, &SetB);
+ SCOPE_GUARD(guard, &SetB);
TEST_EQUAL(b, false, ("Start test condition"));
}
TEST_EQUAL(b, true, ("scope_guard works in destructor"));
@@ -23,7 +23,7 @@ UNIT_TEST(ScopeGuardRelease)
{
{
b = false;
- MY_SCOPE_GUARD(guard, &SetB);
+ SCOPE_GUARD(guard, &SetB);
TEST_EQUAL(b, false, ("Start test condition"));
guard.release();
}
diff --git a/base/scope_guard.hpp b/base/scope_guard.hpp
index 84382e08c2..df907096f4 100644
--- a/base/scope_guard.hpp
+++ b/base/scope_guard.hpp
@@ -59,6 +59,6 @@ impl::GuardImpl<TFunctor> make_scope_guard(TFunctor const & F)
}
} // namespace base
-#define MY_SCOPE_GUARD(name, func) \
- ::base::scope_guard name = base::make_scope_guard(func); static_cast<void>(name);
-
+#define SCOPE_GUARD(name, func) \
+ ::base::scope_guard name = base::make_scope_guard(func); \
+ static_cast<void>(name);