Skip to content

Commit 19f0e8c

Browse files
author
Enrico Granata
committed
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
1 parent 6718a3b commit 19f0e8c

File tree

4 files changed

+149
-158
lines changed

4 files changed

+149
-158
lines changed

‎lldb/include/lldb/API/SBValue.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
#include "lldb/API/SBDefines.h"
1515
#include "lldb/API/SBType.h"
1616

17-
namespace {
18-
class ValueImpl;
19-
}
17+
class ValueImpl;
2018

2119
namespace lldb {
2220

‎lldb/include/lldb/API/SBValueList.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212

1313
#include "lldb/API/SBDefines.h"
1414

15-
namespace {
16-
class ValueListImpl;
17-
}
15+
class ValueListImpl;
1816

1917
namespace lldb {
2018

‎lldb/source/API/SBValue.cpp

Lines changed: 89 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -52,103 +52,101 @@
5252
using namespace lldb;
5353
using namespace lldb_private;
5454

55-
namespace {
56-
class ValueImpl
55+
class ValueImpl
56+
{
57+
public:
58+
ValueImpl ()
5759
{
58-
public:
59-
ValueImpl ()
60-
{
61-
}
62-
63-
ValueImpl (lldb::ValueObjectSP opaque_sp,
64-
lldb::DynamicValueType use_dynamic,
65-
bool use_synthetic) :
66-
m_opaque_sp(opaque_sp),
67-
m_use_dynamic(use_dynamic),
68-
m_use_synthetic(use_synthetic)
69-
{
70-
}
71-
72-
ValueImpl (const ValueImpl& rhs) :
73-
m_opaque_sp(rhs.m_opaque_sp),
74-
m_use_dynamic(rhs.m_use_dynamic),
75-
m_use_synthetic(rhs.m_use_synthetic)
76-
{
77-
}
78-
79-
ValueImpl &
80-
operator = (const ValueImpl &rhs)
81-
{
82-
if (this != &rhs)
83-
{
84-
m_opaque_sp = rhs.m_opaque_sp;
85-
m_use_dynamic = rhs.m_use_dynamic;
86-
m_use_synthetic = rhs.m_use_synthetic;
87-
}
88-
return *this;
89-
}
90-
91-
bool
92-
IsValid ()
60+
}
61+
62+
ValueImpl (lldb::ValueObjectSP opaque_sp,
63+
lldb::DynamicValueType use_dynamic,
64+
bool use_synthetic) :
65+
m_opaque_sp(opaque_sp),
66+
m_use_dynamic(use_dynamic),
67+
m_use_synthetic(use_synthetic)
68+
{
69+
}
70+
71+
ValueImpl (const ValueImpl& rhs) :
72+
m_opaque_sp(rhs.m_opaque_sp),
73+
m_use_dynamic(rhs.m_use_dynamic),
74+
m_use_synthetic(rhs.m_use_synthetic)
75+
{
76+
}
77+
78+
ValueImpl &
79+
operator = (const ValueImpl &rhs)
80+
{
81+
if (this != &rhs)
9382
{
94-
return m_opaque_sp.get() != NULL;
83+
m_opaque_sp = rhs.m_opaque_sp;
84+
m_use_dynamic = rhs.m_use_dynamic;
85+
m_use_synthetic = rhs.m_use_synthetic;
9586
}
96-
97-
lldb::ValueObjectSP
98-
GetRootSP ()
99-
{
87+
return *this;
88+
}
89+
90+
bool
91+
IsValid ()
92+
{
93+
return m_opaque_sp.get() != NULL;
94+
}
95+
96+
lldb::ValueObjectSP
97+
GetRootSP ()
98+
{
99+
return m_opaque_sp;
100+
}
101+
102+
lldb::ValueObjectSP
103+
GetSP ()
104+
{
105+
if (!m_opaque_sp)
100106
return m_opaque_sp;
101-
}
102-
103-
lldb::ValueObjectSP
104-
GetSP ()
105-
{
106-
if (!m_opaque_sp)
107-
return m_opaque_sp;
108-
lldb::ValueObjectSP value_sp = m_opaque_sp;
109-
110-
Mutex::Locker api_lock;
111-
Target *target = value_sp->GetTargetSP().get();
112-
if (target)
113-
api_lock.Lock(target->GetAPIMutex());
114-
115-
if (value_sp->GetDynamicValue(m_use_dynamic))
116-
value_sp = value_sp->GetDynamicValue(m_use_dynamic);
117-
if (value_sp->GetSyntheticValue(m_use_synthetic))
118-
value_sp = value_sp->GetSyntheticValue(m_use_synthetic);
119-
return value_sp;
120-
}
121-
122-
void
123-
SetUseDynamic (lldb::DynamicValueType use_dynamic)
124-
{
125-
m_use_dynamic = use_dynamic;
126-
}
127-
128-
void
129-
SetUseSynthetic (bool use_synthetic)
130-
{
131-
m_use_synthetic = use_synthetic;
132-
}
133-
134-
lldb::DynamicValueType
135-
GetUseDynamic ()
136-
{
137-
return m_use_dynamic;
138-
}
107+
lldb::ValueObjectSP value_sp = m_opaque_sp;
139108

140-
bool
141-
GetUseSynthetic ()
142-
{
143-
return m_use_synthetic;
144-
}
109+
Mutex::Locker api_lock;
110+
Target *target = value_sp->GetTargetSP().get();
111+
if (target)
112+
api_lock.Lock(target->GetAPIMutex());
145113

146-
private:
147-
lldb::ValueObjectSP m_opaque_sp;
148-
lldb::DynamicValueType m_use_dynamic;
149-
bool m_use_synthetic;
150-
};
151-
}
114+
if (value_sp->GetDynamicValue(m_use_dynamic))
115+
value_sp = value_sp->GetDynamicValue(m_use_dynamic);
116+
if (value_sp->GetSyntheticValue(m_use_synthetic))
117+
value_sp = value_sp->GetSyntheticValue(m_use_synthetic);
118+
return value_sp;
119+
}
120+
121+
void
122+
SetUseDynamic (lldb::DynamicValueType use_dynamic)
123+
{
124+
m_use_dynamic = use_dynamic;
125+
}
126+
127+
void
128+
SetUseSynthetic (bool use_synthetic)
129+
{
130+
m_use_synthetic = use_synthetic;
131+
}
132+
133+
lldb::DynamicValueType
134+
GetUseDynamic ()
135+
{
136+
return m_use_dynamic;
137+
}
138+
139+
bool
140+
GetUseSynthetic ()
141+
{
142+
return m_use_synthetic;
143+
}
144+
145+
private:
146+
lldb::ValueObjectSP m_opaque_sp;
147+
lldb::DynamicValueType m_use_dynamic;
148+
bool m_use_synthetic;
149+
};
152150

153151
SBValue::SBValue () :
154152
m_opaque_sp ()

‎lldb/source/API/SBValueList.cpp

Lines changed: 58 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -19,72 +19,69 @@
1919
using namespace lldb;
2020
using namespace lldb_private;
2121

22-
namespace {
23-
class ValueListImpl
22+
class ValueListImpl
23+
{
24+
public:
25+
ValueListImpl () :
26+
m_values()
2427
{
25-
public:
26-
ValueListImpl () :
27-
m_values()
28-
{
29-
}
30-
31-
ValueListImpl (const ValueListImpl& rhs) :
32-
m_values(rhs.m_values)
33-
{
34-
}
35-
36-
ValueListImpl&
37-
operator = (const ValueListImpl& rhs)
38-
{
39-
if (this == &rhs)
40-
return *this;
41-
m_values = rhs.m_values;
28+
}
29+
30+
ValueListImpl (const ValueListImpl& rhs) :
31+
m_values(rhs.m_values)
32+
{
33+
}
34+
35+
ValueListImpl&
36+
operator = (const ValueListImpl& rhs)
37+
{
38+
if (this == &rhs)
4239
return *this;
43-
};
44-
45-
uint32_t
46-
GetSize ()
47-
{
48-
return m_values.size();
49-
}
50-
51-
void
52-
Append (const lldb::SBValue& sb_value)
53-
{
54-
m_values.push_back(sb_value);
55-
}
56-
57-
void
58-
Append (const ValueListImpl& list)
59-
{
60-
for (auto val : list.m_values)
61-
Append (val);
62-
}
63-
64-
lldb::SBValue
65-
GetValueAtIndex (uint32_t index)
66-
{
67-
if (index >= GetSize())
68-
return lldb::SBValue();
69-
return m_values[index];
70-
}
71-
72-
lldb::SBValue
73-
FindValueByUID (lldb::user_id_t uid)
74-
{
75-
for (auto val : m_values)
76-
{
77-
if (val.IsValid() && val.GetID() == uid)
78-
return val;
79-
}
40+
m_values = rhs.m_values;
41+
return *this;
42+
};
43+
44+
uint32_t
45+
GetSize ()
46+
{
47+
return m_values.size();
48+
}
49+
50+
void
51+
Append (const lldb::SBValue& sb_value)
52+
{
53+
m_values.push_back(sb_value);
54+
}
55+
56+
void
57+
Append (const ValueListImpl& list)
58+
{
59+
for (auto val : list.m_values)
60+
Append (val);
61+
}
62+
63+
lldb::SBValue
64+
GetValueAtIndex (uint32_t index)
65+
{
66+
if (index >= GetSize())
8067
return lldb::SBValue();
68+
return m_values[index];
69+
}
70+
71+
lldb::SBValue
72+
FindValueByUID (lldb::user_id_t uid)
73+
{
74+
for (auto val : m_values)
75+
{
76+
if (val.IsValid() && val.GetID() == uid)
77+
return val;
8178
}
79+
return lldb::SBValue();
80+
}
8281

83-
private:
84-
std::vector<lldb::SBValue> m_values;
85-
};
86-
}
87-
82+
private:
83+
std::vector<lldb::SBValue> m_values;
84+
};
8885

8986
SBValueList::SBValueList () :
9087
m_opaque_ap ()

0 commit comments

Comments
 (0)