[osmium-tool] 05/97: Update because libosmium moved some classes out of the 'osm' namespace.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to tag v1.0.0
in repository osmium-tool.

commit 8df46a8896bffed1ed20a3d0923ef5ec6b3461d0
Author: Jochen Topf <jochen at topf.org>
Date:   Thu Jun 19 10:16:27 2014 +0200

    Update because libosmium moved some classes out of the 'osm' namespace.
---
 src/command_apply_changes.cpp | 10 +++++-----
 src/command_merge_changes.cpp | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/command_apply_changes.cpp b/src/command_apply_changes.cpp
index 82328d6..9b86cdc 100644
--- a/src/command_apply_changes.cpp
+++ b/src/command_apply_changes.cpp
@@ -27,7 +27,7 @@ namespace po = boost::program_options;
 #include <osmium/io/any_input.hpp>
 #include <osmium/io/any_output.hpp>
 #include <osmium/io/output_iterator.hpp>
-#include <osmium/osm/object_pointer_collection.hpp>
+#include <osmium/object_pointer_collection.hpp>
 #include <osmium/osm/object_comparisons.hpp>
 
 #include "command_apply_changes.hpp"
@@ -120,7 +120,7 @@ bool CommandApplyChanges::setup(const std::vector<std::string>& arguments) {
 
 bool CommandApplyChanges::run() {
     std::vector<osmium::memory::Buffer> changes;
-    osmium::osm::ObjectPointerCollection objects;
+    osmium::ObjectPointerCollection objects;
 
     for (const std::string& change_file_name : m_change_filenames) {
         osmium::io::Reader reader(change_file_name);
@@ -142,7 +142,7 @@ bool CommandApplyChanges::run() {
         // If the --simplify option was given we sort with the
         // largest version of each object first and then only
         // copy this last version of any object to the output_buffer.
-        objects.sort(osmium::osm::object_order_type_id_reverse_version());
+        objects.sort(osmium::object_order_type_id_reverse_version());
 
         osmium::object_id_type id = 0;
         bool keep_deleted = !m_remove_deleted;
@@ -161,12 +161,12 @@ bool CommandApplyChanges::run() {
                        osmium::io::InputIterator<osmium::io::Reader, osmium::Object> {reader},
                        osmium::io::InputIterator<osmium::io::Reader, osmium::Object> {},
                        output_it,
-                       osmium::osm::object_order_type_id_reverse_version());
+                       osmium::object_order_type_id_reverse_version());
     } else {
         // If the --simplify option was not given, this
         // is a straightforward sort of the change files
         // and the a merge with the input file.
-        objects.sort(osmium::osm::object_order_type_id_version());
+        objects.sort(osmium::object_order_type_id_version());
 
         std::set_union(objects.begin(),
                        objects.end(),
diff --git a/src/command_merge_changes.cpp b/src/command_merge_changes.cpp
index e9f5839..8f367db 100644
--- a/src/command_merge_changes.cpp
+++ b/src/command_merge_changes.cpp
@@ -28,7 +28,7 @@ namespace po = boost::program_options;
 #include <osmium/io/any_input.hpp>
 #include <osmium/io/any_output.hpp>
 #include <osmium/io/output_iterator.hpp>
-#include <osmium/osm/object_pointer_collection.hpp>
+#include <osmium/object_pointer_collection.hpp>
 #include <osmium/osm/object_comparisons.hpp>
 
 #include "command_merge_changes.hpp"
@@ -120,7 +120,7 @@ bool CommandMergeChanges::run() {
     // this will contain all the buffers with the input data
     std::vector<osmium::memory::Buffer> changes;
 
-    osmium::osm::ObjectPointerCollection objects;
+    osmium::ObjectPointerCollection objects;
 
     // read all input files, keep the buffers around and add pointer
     // to each object to objects collection.
@@ -143,12 +143,12 @@ bool CommandMergeChanges::run() {
         // If the --simplify option was given we sort with the
         // largest version of each object first and then only
         // copy this last version of any object to the output_buffer.
-        objects.sort(osmium::osm::object_order_type_id_reverse_version());
-        std::unique_copy(objects.cbegin(), objects.cend(), out, osmium::osm::object_equal_type_id());
+        objects.sort(osmium::object_order_type_id_reverse_version());
+        std::unique_copy(objects.cbegin(), objects.cend(), out, osmium::object_equal_type_id());
     } else {
         // If the --simplify option was not given, this
         // is a straightforward sort and copy.
-        objects.sort(osmium::osm::object_order_type_id_version());
+        objects.sort(osmium::object_order_type_id_version());
         std::copy(objects.cbegin(), objects.cend(), out);
     }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git