1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
--- src/liborcus/pstring.cpp 2012-09-07 06:00:35.000000000 +0200
+++ src/liborcus/pstring.cpp 2012-09-07 16:56:14.000000000 +0200
@@ -57,25 +57,25 @@
pstring pstring::intern(const char* str, size_t n)
{
- ::boost::mutex::scoped_lock(interned_strings.mtx);
+ ::boost::mutex::scoped_lock lock(interned_strings.mtx);
return interned_strings.store.intern(str, n);
}
void pstring::intern::dispose()
{
- ::boost::mutex::scoped_lock(interned_strings.mtx);
+ ::boost::mutex::scoped_lock lock(interned_strings.mtx);
interned_strings.store.clear();
}
size_t pstring::intern::size()
{
- ::boost::mutex::scoped_lock(interned_strings.mtx);
+ ::boost::mutex::scoped_lock lock(interned_strings.mtx);
return interned_strings.store.size();
}
void pstring::intern::dump()
{
- ::boost::mutex::scoped_lock(interned_strings.mtx);
+ ::boost::mutex::scoped_lock lock(interned_strings.mtx);
interned_strings.store.dump();
}
--- src/liborcus/xml_map_tree.cpp 2012-09-07 06:00:35.000000000 +0200
+++ src/liborcus/xml_map_tree.cpp 2012-09-07 16:59:23.000000000 +0200
@@ -55,15 +55,14 @@
{
const char* mp_char;
const char* mp_end;
- size_t m_size;
public:
- xpath_parser(const char* p, size_t n) : mp_char(p), mp_end(p+n), m_size(n)
+ xpath_parser(const char* p, size_t n) : mp_char(p), mp_end(p+n)
{
if (!n)
- xml_map_tree::xpath_error("empty path");
+ throw xml_map_tree::xpath_error("empty path");
if (*p != '/')
- xml_map_tree::xpath_error("first character must be '/'.");
+ throw xml_map_tree::xpath_error("first character must be '/'.");
++mp_char;
}
@@ -414,7 +413,7 @@
{
// Make sure the root element's names are the same.
if (mp_root->name != name)
- xpath_error("path begins with inconsistent root level name.");
+ throw xpath_error("path begins with inconsistent root level name.");
}
else
{
--- include/orcus/pstring.hpp
+++ include/orcus/pstring.hpp
@@ -82,8 +82,8 @@
};
pstring() : m_pos(NULL), m_size(0) {}
- pstring(const char* pos) : m_pos(pos) { m_size = ::std::strlen(pos); }
- pstring(const char* pos, size_t size) : m_pos(pos), m_size(size) {}
+ pstring(const char* pos_) : m_pos(pos_) { m_size = ::std::strlen(pos_); }
+ pstring(const char* pos_, size_t size_) : m_pos(pos_), m_size(size_) {}
::std::string str() const { return ::std::string(m_pos, m_size); }
@@ -110,11 +110,11 @@
bool operator< (const pstring& r) const;
- bool operator== (const char* str) const;
+ bool operator== (const char* str_) const;
- bool operator!= (const char* str) const
+ bool operator!= (const char* str_) const
{
- return !operator==(str);
+ return !operator==(str_);
}
pstring trim() const;
|
