[osmium-tool] 10/97: Rename osmium::Object to osmium::OSMObject in libosmium.

[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 85f1f5f519dfbdcd1f1151ecc0f7d1cd49ecc4a8
Author: Jochen Topf <jochen at topf.org>
Date:   Tue Jun 24 16:40:39 2014 +0200

    Rename osmium::Object to osmium::OSMObject in libosmium.
---
 src/command_apply_changes.cpp | 10 +++++-----
 src/command_time_filter.cpp   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/command_apply_changes.cpp b/src/command_apply_changes.cpp
index 483cf80..6a702a7 100644
--- a/src/command_apply_changes.cpp
+++ b/src/command_apply_changes.cpp
@@ -147,7 +147,7 @@ bool CommandApplyChanges::run() {
         osmium::object_id_type id = 0;
         bool keep_deleted = !m_remove_deleted;
 
-        auto output_it = boost::make_function_output_iterator([&out, &id, keep_deleted](const osmium::Object& obj) {
+        auto output_it = boost::make_function_output_iterator([&out, &id, keep_deleted](const osmium::OSMObject& obj) {
             if (obj.id() != id) {
                 if (keep_deleted || obj.visible()) {
                     *out = obj;
@@ -158,8 +158,8 @@ bool CommandApplyChanges::run() {
 
         std::set_union(objects.begin(),
                        objects.end(),
-                       osmium::io::InputIterator<osmium::io::Reader, osmium::Object> {reader},
-                       osmium::io::InputIterator<osmium::io::Reader, osmium::Object> {},
+                       osmium::io::InputIterator<osmium::io::Reader, osmium::OSMObject> {reader},
+                       osmium::io::InputIterator<osmium::io::Reader, osmium::OSMObject> {},
                        output_it,
                        osmium::object_order_type_id_reverse_version());
     } else {
@@ -170,8 +170,8 @@ bool CommandApplyChanges::run() {
 
         std::set_union(objects.begin(),
                        objects.end(),
-                       osmium::io::InputIterator<osmium::io::Reader, osmium::Object> {reader},
-                       osmium::io::InputIterator<osmium::io::Reader, osmium::Object> {},
+                       osmium::io::InputIterator<osmium::io::Reader, osmium::OSMObject> {reader},
+                       osmium::io::InputIterator<osmium::io::Reader, osmium::OSMObject> {},
                        out);
     }
 
diff --git a/src/command_time_filter.cpp b/src/command_time_filter.cpp
index 43a20b8..203dabb 100644
--- a/src/command_time_filter.cpp
+++ b/src/command_time_filter.cpp
@@ -151,7 +151,7 @@ bool CommandTimeFilter::run() {
     osmium::io::Writer writer(m_output_file, header, m_output_overwrite);
     osmium::io::OutputIterator<osmium::io::Writer> out(writer);
 
-    typedef osmium::io::InputIterator<osmium::io::Reader, osmium::Object> object_iterator;
+    typedef osmium::io::InputIterator<osmium::io::Reader, osmium::OSMObject> object_iterator;
 
     object_iterator object_it(reader);
     object_iterator object_end;

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