Daniel Malea reported seeing warnings for the use of anonymous namespaces in our public API.

Removing these namespace { ... } declarations (but still keeping the helper *Impl objects outside of namespace lldb proper)

llvm-svn: 180067

4 files changed, 149 insertions, 158 deletions

diff --git a/lldb/include/lldb/API/SBValue.h b/lldb/include/lldb/API/SBValue.h
index 623c562b68c..170e3bd5865 100644
--- a/lldb/include/lldb/API/SBValue.h
+++ b/lldb/include/lldb/API/SBValue.h
@@ -14,9 +14,7 @@
 #include "lldb/API/SBDefines.h"
 #include "lldb/API/SBType.h"
 
-namespace {
-    class ValueImpl;
-}
+class ValueImpl;
 
 namespace lldb {
 
diff --git a/lldb/include/lldb/API/SBValueList.h b/lldb/include/lldb/API/SBValueList.h
index 503c7999f71..b9a6aedea3c 100644
--- a/lldb/include/lldb/API/SBValueList.h
+++ b/lldb/include/lldb/API/SBValueList.h
@@ -12,9 +12,7 @@
 
 #include "lldb/API/SBDefines.h"
 
-namespace {
-    class ValueListImpl;
-}
+class ValueListImpl;
 
 namespace lldb {
 
diff --git a/lldb/source/API/SBValue.cpp b/lldb/source/API/SBValue.cpp
index 435dcff7a3e..d467d791f22 100644
--- a/lldb/source/API/SBValue.cpp
+++ b/lldb/source/API/SBValue.cpp
@@ -52,103 +52,101 @@
 using namespace lldb;
 using namespace lldb_private;
 
-namespace {
-    class ValueImpl
+class ValueImpl
+{
+public:
+    ValueImpl ()
     {
-    public:
-        ValueImpl ()
-        {
-        }
-        
-        ValueImpl (lldb::ValueObjectSP opaque_sp,
-                   lldb::DynamicValueType use_dynamic,
-                   bool use_synthetic) :
-            m_opaque_sp(opaque_sp),
-            m_use_dynamic(use_dynamic),
-            m_use_synthetic(use_synthetic)
-        {
-        }
-        
-        ValueImpl (const ValueImpl& rhs) :
-            m_opaque_sp(rhs.m_opaque_sp),
-            m_use_dynamic(rhs.m_use_dynamic),
-            m_use_synthetic(rhs.m_use_synthetic)
-        {
-        }
-        
-        ValueImpl &
-        operator = (const ValueImpl &rhs)
-        {
-            if (this != &rhs)
-            {
-                m_opaque_sp = rhs.m_opaque_sp;
-                m_use_dynamic = rhs.m_use_dynamic;
-                m_use_synthetic = rhs.m_use_synthetic;
-            }
-            return *this;
-        }
-        
-        bool
-        IsValid ()
+    }
+    
+    ValueImpl (lldb::ValueObjectSP opaque_sp,
+               lldb::DynamicValueType use_dynamic,
+               bool use_synthetic) :
+        m_opaque_sp(opaque_sp),
+        m_use_dynamic(use_dynamic),
+        m_use_synthetic(use_synthetic)
+    {
+    }
+    
+    ValueImpl (const ValueImpl& rhs) :
+        m_opaque_sp(rhs.m_opaque_sp),
+        m_use_dynamic(rhs.m_use_dynamic),
+        m_use_synthetic(rhs.m_use_synthetic)
+    {
+    }
+    
+    ValueImpl &
+    operator = (const ValueImpl &rhs)
+    {
+        if (this != &rhs)
         {
-            return m_opaque_sp.get() != NULL;
+            m_opaque_sp = rhs.m_opaque_sp;
+            m_use_dynamic = rhs.m_use_dynamic;
+            m_use_synthetic = rhs.m_use_synthetic;
         }
-        
-        lldb::ValueObjectSP
-        GetRootSP ()
-        {
+        return *this;
+    }
+    
+    bool
+    IsValid ()
+    {
+        return m_opaque_sp.get() != NULL;
+    }
+    
+    lldb::ValueObjectSP
+    GetRootSP ()
+    {
+        return m_opaque_sp;
+    }
+    
+    lldb::ValueObjectSP
+    GetSP ()
+    {
+        if (!m_opaque_sp)
             return m_opaque_sp;
-        }
-        
-        lldb::ValueObjectSP
-        GetSP ()
-        {
-            if (!m_opaque_sp)
-                return m_opaque_sp;
-            lldb::ValueObjectSP value_sp = m_opaque_sp;
-            
-            Mutex::Locker api_lock;
-            Target *target = value_sp->GetTargetSP().get();
-            if (target)
-                api_lock.Lock(target->GetAPIMutex());
-            
-            if (value_sp->GetDynamicValue(m_use_dynamic))
-                value_sp = value_sp->GetDynamicValue(m_use_dynamic);
-            if (value_sp->GetSyntheticValue(m_use_synthetic))
-                value_sp = value_sp->GetSyntheticValue(m_use_synthetic);
-            return value_sp;
-        }
-        
-        void
-        SetUseDynamic (lldb::DynamicValueType use_dynamic)
-        {
-            m_use_dynamic = use_dynamic;
-        }
-        
-        void
-        SetUseSynthetic (bool use_synthetic)
-        {
-            m_use_synthetic = use_synthetic;
-        }
-        
-        lldb::DynamicValueType
-        GetUseDynamic ()
-        {
-            return m_use_dynamic;
-        }
+        lldb::ValueObjectSP value_sp = m_opaque_sp;
         
-        bool
-        GetUseSynthetic ()
-        {
-            return m_use_synthetic;
-        }
+        Mutex::Locker api_lock;
+        Target *target = value_sp->GetTargetSP().get();
+        if (target)
+            api_lock.Lock(target->GetAPIMutex());
         
-    private:
-        lldb::ValueObjectSP m_opaque_sp;
-        lldb::DynamicValueType m_use_dynamic;
-        bool m_use_synthetic;
-    };
-}
+        if (value_sp->GetDynamicValue(m_use_dynamic))
+            value_sp = value_sp->GetDynamicValue(m_use_dynamic);
+        if (value_sp->GetSyntheticValue(m_use_synthetic))
+            value_sp = value_sp->GetSyntheticValue(m_use_synthetic);
+        return value_sp;
+    }
+    
+    void
+    SetUseDynamic (lldb::DynamicValueType use_dynamic)
+    {
+        m_use_dynamic = use_dynamic;
+    }
+    
+    void
+    SetUseSynthetic (bool use_synthetic)
+    {
+        m_use_synthetic = use_synthetic;
+    }
+    
+    lldb::DynamicValueType
+    GetUseDynamic ()
+    {
+        return m_use_dynamic;
+    }
+    
+    bool
+    GetUseSynthetic ()
+    {
+        return m_use_synthetic;
+    }
+    
+private:
+    lldb::ValueObjectSP m_opaque_sp;
+    lldb::DynamicValueType m_use_dynamic;
+    bool m_use_synthetic;
+};
 
 SBValue::SBValue () :
     m_opaque_sp ()
diff --git a/lldb/source/API/SBValueList.cpp b/lldb/source/API/SBValueList.cpp
index d36e448af5f..46866eb3742 100644
--- a/lldb/source/API/SBValueList.cpp
+++ b/lldb/source/API/SBValueList.cpp
@@ -19,72 +19,69 @@
 using namespace lldb;
 using namespace lldb_private;
 
-namespace {
-    class ValueListImpl
+class ValueListImpl
+{
+public:
+    ValueListImpl () :
+    m_values()
     {
-    public:
-        ValueListImpl () :
-        m_values()
-        {
-        }
-        
-        ValueListImpl (const ValueListImpl& rhs) :
-        m_values(rhs.m_values)
-        {
-        }
-        
-        ValueListImpl&
-        operator = (const ValueListImpl& rhs)
-        {
-            if (this == &rhs)
-                return *this;
-            m_values = rhs.m_values;
+    }
+    
+    ValueListImpl (const ValueListImpl& rhs) :
+    m_values(rhs.m_values)
+    {
+    }
+    
+    ValueListImpl&
+    operator = (const ValueListImpl& rhs)
+    {
+        if (this == &rhs)
             return *this;
-        };
-        
-        uint32_t
-        GetSize ()
-        {
-            return m_values.size();
-        }
-        
-        void
-        Append (const lldb::SBValue& sb_value)
-        {
-            m_values.push_back(sb_value);
-        }
-        
-        void
-        Append (const ValueListImpl& list)
-        {
-            for (auto val : list.m_values)
-                Append (val);
-        }
-        
-        lldb::SBValue
-        GetValueAtIndex (uint32_t index)
-        {
-            if (index >= GetSize())
-                return lldb::SBValue();
-            return m_values[index];
-        }
-        
-        lldb::SBValue
-        FindValueByUID (lldb::user_id_t uid)
-        {
-            for (auto val : m_values)
-            {
-                if (val.IsValid() && val.GetID() == uid)
-                    return val;
-            }
+        m_values = rhs.m_values;
+        return *this;
+    };
+    
+    uint32_t
+    GetSize ()
+    {
+        return m_values.size();
+    }
+    
+    void
+    Append (const lldb::SBValue& sb_value)
+    {
+        m_values.push_back(sb_value);
+    }
+    
+    void
+    Append (const ValueListImpl& list)
+    {
+        for (auto val : list.m_values)
+            Append (val);
+    }
+    
+    lldb::SBValue
+    GetValueAtIndex (uint32_t index)
+    {
+        if (index >= GetSize())
             return lldb::SBValue();
+        return m_values[index];
+    }
+    
+    lldb::SBValue
+    FindValueByUID (lldb::user_id_t uid)
+    {
+        for (auto val : m_values)
+        {
+            if (val.IsValid() && val.GetID() == uid)
+                return val;
         }
+        return lldb::SBValue();
+    }
 
-    private:
-        std::vector<lldb::SBValue> m_values;
-    };
-}
-
+private:
+    std::vector<lldb::SBValue> m_values;
+};
 
 SBValueList::SBValueList () :
     m_opaque_ap ()