Merged third_party/tcmalloc/vendor/src(google-perftools r87) into...

third_party/tcmalloc/chromium/src/base/spinlock.h

 /* Copyright (c) 2006, Google Inc.
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 116 matching lines @@
   static const base::LinkerInitialized LINKER_INITIALIZED;  // backwards compat
  private:
   // Lock-state:  0 means unlocked; 1 means locked with no waiters; values
   // greater than 1 indicate locked with waiters, where the value is the time
   // the first waiter started waiting and is used for contention profiling.
   volatile Atomic32 lockword_;
 
   void SlowLock();
   void SlowUnlock(int64 wait_timestamp);
 
-  DISALLOW_EVIL_CONSTRUCTORS(SpinLock);
+  DISALLOW_COPY_AND_ASSIGN(SpinLock);
 };
 
 // Corresponding locker object that arranges to acquire a spinlock for
 // the duration of a C++ scope.
 class SCOPED_LOCKABLE SpinLockHolder {
  private:
   SpinLock* lock_;
  public:
   inline explicit SpinLockHolder(SpinLock* l) EXCLUSIVE_LOCK_FUNCTION(l)
       : lock_(l) {
     l->Lock();
   }
   // TODO(csilvers): uncomment the annotation when we figure out how to
   //                 support this macro with 0 args (see thread_annotations.h)
   inline ~SpinLockHolder() /*UNLOCK_FUNCTION()*/ { lock_->Unlock(); }
 };
 // Catch bug where variable name is omitted, e.g. SpinLockHolder (&lock);
 #define SpinLockHolder(x) COMPILE_ASSERT(0, spin_lock_decl_missing_var_name)
 
 
 #endif  // BASE_SPINLOCK_H_