diff options
Diffstat (limited to 'liborcus')
-rw-r--r-- | liborcus/UnpackedTarball_orcus.mk | 2 | ||||
-rw-r--r-- | liborcus/liborcus_0.1.0-warnings.patch | 62 |
2 files changed, 0 insertions, 64 deletions
diff --git a/liborcus/UnpackedTarball_orcus.mk b/liborcus/UnpackedTarball_orcus.mk index ec1f7c4136c3..6d2a7f2b61be 100644 --- a/liborcus/UnpackedTarball_orcus.mk +++ b/liborcus/UnpackedTarball_orcus.mk @@ -14,8 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,orcus,$(ORCUS_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,orcus,0)) orcus_patches := -# -Werror,-Wunused-variable -Werror,-Wunused-private-field -orcus_patches += liborcus_0.1.0-warnings.patch # make config.sub recognize arm-linux-androideabi orcus_patches += liborcus_0.1.0-configure.patch # fix MinGW build diff --git a/liborcus/liborcus_0.1.0-warnings.patch b/liborcus/liborcus_0.1.0-warnings.patch deleted file mode 100644 index 8ce6533c0908..000000000000 --- a/liborcus/liborcus_0.1.0-warnings.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- 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 - { |