From: Owen Anderson Date: Fri, 19 Jun 2009 00:48:22 +0000 (+0000) Subject: Fix weird class-size-being-different problems. At some level this is being caused... X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=4f10c3b4dc505e8f8e8c1be1de2353276df06fdb;p=oota-llvm.git Fix weird class-size-being-different problems. At some level this is being caused by config.h not being included everywhere. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@73745 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/System/Mutex.h b/include/llvm/System/Mutex.h index 6f5614f701f..2a70ba013a0 100644 --- a/include/llvm/System/Mutex.h +++ b/include/llvm/System/Mutex.h @@ -68,9 +68,7 @@ namespace llvm /// @name Platform Dependent Data /// @{ private: -#ifdef ENABLE_THREADS void* data_; ///< We don't know what the data will be -#endif /// @} /// @name Do Not Implement diff --git a/include/llvm/System/RWMutex.h b/include/llvm/System/RWMutex.h index 6a254b873a5..aa5b0b946aa 100644 --- a/include/llvm/System/RWMutex.h +++ b/include/llvm/System/RWMutex.h @@ -68,9 +68,7 @@ namespace llvm /// @name Platform Dependent Data /// @{ private: -#ifdef ENABLE_THREADS void* data_; ///< We don't know what the data will be -#endif /// @} /// @name Do Not Implement @@ -85,12 +83,12 @@ namespace llvm /// indicates whether this mutex should become a no-op when we're not /// running in multithreaded mode. template - class SmartRWMutex : RWMutexImpl { + class SmartRWMutex : public RWMutexImpl { public: explicit SmartRWMutex() : RWMutexImpl() { } bool reader_acquire() { - if (!mt_only && llvm_is_multithreaded()) + if (!mt_only || llvm_is_multithreaded()) return RWMutexImpl::reader_acquire(); return true; }