X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2FSynchronized.h;h=afbaef2e0f38ad9675402e36e81ac4a436c74040;hb=d2c8a36b6b96eea44e9e92fa6946d607f8530b07;hp=beef1b756534f2c0843331049ef11774087a3666;hpb=79212dac968aad6e2a9b8fb1320daad6faf49f4a;p=folly.git

diff --git a/folly/Synchronized.h b/folly/Synchronized.h
index beef1b75..afbaef2e 100644
--- a/folly/Synchronized.h
+++ b/folly/Synchronized.h
@@ -1151,7 +1151,7 @@ class LockedPtr : public LockedPtrBase<
       typename = typename std::enable_if<
           LockTraits<typename SyncType::MutexType>::is_upgrade>::type>
   LockedPtr<SynchronizedType, LockPolicyFromUpgradeToShared>
-  moveFromUpgradeToShared() {
+  moveFromUpgradeToRead() {
     auto* parent_to_pass_on = this->parent_;
     this->parent_ = nullptr;
     return LockedPtr<SynchronizedType, LockPolicyFromUpgradeToShared>(
@@ -1167,7 +1167,7 @@ class LockedPtr : public LockedPtrBase<
       typename = typename std::enable_if<
           LockTraits<typename SyncType::MutexType>::is_upgrade>::type>
   LockedPtr<SynchronizedType, LockPolicyFromExclusiveToShared>
-  moveFromWriteToShared() {
+  moveFromWriteToRead() {
     auto* parent_to_pass_on = this->parent_;
     this->parent_ = nullptr;
     return LockedPtr<SynchronizedType, LockPolicyFromExclusiveToShared>(
@@ -1302,6 +1302,7 @@ void swap(Synchronized<T, M>& lhs, Synchronized<T, M>& rhs) {
 #define SYNCHRONIZED(...)                                             \
   FOLLY_PUSH_WARNING                                                  \
   FOLLY_GCC_DISABLE_WARNING(shadow)                                   \
+  FOLLY_GCC_DISABLE_NEW_SHADOW_WARNINGS                               \
   if (bool SYNCHRONIZED_state = false) {                              \
   } else                                                              \
     for (auto SYNCHRONIZED_lockedPtr =                                \