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

2 files changed, 2 insertions, 6 deletions

diff --git a/include/llvm/System/Mutex.h b/include/llvm/System/Mutex.h
index 6f5614f701..2a70ba013a 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 6a254b873a..aa5b0b946a 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<bool mt_only>
-    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;
       }