Remove code that has been deprecated for a while

Author: joto

CHANGELOG.md

@@ -15,6 +15,36 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ### Fixed
 
+### Removed deprecated parts of the code
+
+Several parts of libosmium have been marked deprecated, many of them for a very
+long time. These are now removed:
+
+* Sparsehash index class `osmium::index::map::SparseMemTable` as well as the
+  complete file `osmium/index/map/sparse_mem_table.hpp`.
+* Callback functionality of the `osmium::memory::Buffer` class. The
+  `set_full_callback()` will not be available any more. See the source
+  for replacement options.
+* Various `osmium::builder::build_*` functions in
+  `osmium/builder/builder_helper.hpp`. Use `osmium::builder::add_*`
+  functions instead. Removes `builder_helper.hpp`.
+* `osmium::builder::Builder::add_item(const osmium::memory::Item* item)`.
+  Use the function of the same name taking a reference instead.
+* `osmium::builder::OSMObject/ChangesetBuilder::add_user()`. Use
+  `set_user()` instead.
+* `osmium::builder::ChangesetBuilder::bounds()` returning a modifiable
+  reference. Use `set_bounds()` instead.
+* Several functions around `osmium::io::OutputIterator`.
+* `osmium::Area::inner_ring_cbegin/cend()`, use `inner_rings()` instead.
+* `osmium::RelationMember::ref()`, use `set_ref()` instead.
+* Implicit conversion from `osmium::Timestamp` to `std::time_t`. Use
+  `seconds_since_epoch()` instead.
+* `osmium::string_to_user_id()`, use `string_to_uid` instead.
+* `osmium::static_cast_with_assert()` helper functions as well as the
+  complete include file `osmium/util/cast.hpp`.
+* Some constructors of `osmium::util::MemoryMapping` and
+  `osmium::util::TypedMemoryMapping`. Use other constructor instead.
+
 
 ## [2.17.3] - 2022-01-19
 

include/osmium/area/assembler_config.hpp

@@ -33,8 +33,6 @@ DEALINGS IN THE SOFTWARE.
 
 */
 
-#include <osmium/util/compatibility.hpp>
-
 namespace osmium {
 
     namespace area {
@@ -135,16 +133,6 @@ namespace osmium {
                 debug_level(d) {
             }
 
-            /**
-             * Enable or disable debug output to stderr. This is for Osmium
-             * developers only.
-             *
-             * @deprecated Set debug_level directly.
-             */
-            OSMIUM_DEPRECATED void enable_debug_output(bool d = true) {
-                debug_level = d;
-            }
-
         }; // struct AssemblerConfig
 
     } // namespace area

include/osmium/builder/builder.hpp

@@ -35,7 +35,6 @@ DEALINGS IN THE SOFTWARE.
 
 #include <osmium/memory/buffer.hpp>
 #include <osmium/memory/item.hpp>
-#include <osmium/util/compatibility.hpp>
 
 #include <algorithm>
 #include <cassert>
@@ -187,18 +186,6 @@ namespace osmium {
                 return append(str, static_cast<osmium::memory::item_size_type>(std::strlen(str) + 1));
             }
 
-            /**
-             * Append '\0' to the buffer.
-             *
-             * @deprecated Use append_with_zero() instead.
-             *
-             * @returns The number of bytes appended (always 1).
-             */
-            OSMIUM_DEPRECATED osmium::memory::item_size_type append_zero() {
-                *reserve_space(1) = '\0';
-                return 1;
-            }
-
         public:
 
             Builder(const Builder&) = delete;
@@ -221,15 +208,6 @@ namespace osmium {
                 add_size(item.padded_size());
             }
 
-            /**
-             * @deprecated Use the version of add_item() taking a
-             *             reference instead.
-             */
-            OSMIUM_DEPRECATED void add_item(const osmium::memory::Item* item) {
-                assert(item);
-                add_item(*item);
-            }
-
         }; // class Builder
 
     } // namespace builder

include/osmium/builder/builder_helper.hpp

@@ -48,7 +48,6 @@ DEALINGS IN THE SOFTWARE.
 #include <osmium/osm/timestamp.hpp>
 #include <osmium/osm/types.hpp>
 #include <osmium/osm/way.hpp>
-#include <osmium/util/compatibility.hpp>
 
 #include <algorithm>
 #include <cassert>
@@ -488,12 +487,6 @@ namespace osmium {
                 return set_user(user.data(), static_cast<string_size_type>(user.size()));
             }
 
-            /// @deprecated Use set_user(...) instead.
-            template <typename... TArgs>
-            OSMIUM_DEPRECATED void add_user(TArgs&&... args) {
-                set_user(std::forward<TArgs>(args)...);
-            }
-
             OSMIUM_FORWARD(set_id)
             OSMIUM_FORWARD(set_visible)
             OSMIUM_FORWARD(set_deleted)
@@ -648,11 +641,6 @@ namespace osmium {
             OSMIUM_FORWARD(set_attribute)
             OSMIUM_FORWARD(set_removed)
 
-            // @deprecated Use set_bounds() instead.
-            OSMIUM_DEPRECATED osmium::Box& bounds() noexcept {
-                return object().bounds();
-            }
-
             ChangesetBuilder& set_bounds(const osmium::Box& box) noexcept {
                 object().bounds() = box;
                 return *this;
@@ -704,12 +692,6 @@ namespace osmium {
                 return set_user(user.data(), static_cast<string_size_type>(user.size()));
             }
 
-            /// @deprecated Use set_user(...) instead.
-            template <typename... TArgs>
-            OSMIUM_DEPRECATED void add_user(TArgs&&... args) {
-                set_user(std::forward<TArgs>(args)...);
-            }
-
         }; // class ChangesetBuilder
 
 #undef OSMIUM_FORWARD

include/osmium/builder/osm_object_builder.hpp

@@ -54,7 +54,6 @@ DEALINGS IN THE SOFTWARE.
 
 #include <osmium/geom/coordinates.hpp>
 #include <osmium/geom/factory.hpp>
-#include <osmium/util/compatibility.hpp>
 
 #include <geos/geom/Coordinate.h>
 #include <geos/geom/CoordinateSequence.h>
@@ -116,16 +115,6 @@ namespace osmium {
                     m_geos_factory(&geos_factory) {
                 }
 
-                /**
-                 * @deprecated Do not set SRID explicitly. It will be set to the
-                 *             correct value automatically.
-                 */
-                OSMIUM_DEPRECATED explicit GEOSFactoryImpl(int /* srid */, int srid) :
-                    m_precision_model(new geos::geom::PrecisionModel),
-                    m_our_geos_factory(new geos::geom::GeometryFactory{m_precision_model.get(), srid}),
-                    m_geos_factory(m_our_geos_factory.get()) {
-                }
-
                 explicit GEOSFactoryImpl(int srid) :
                     m_precision_model(new geos::geom::PrecisionModel),
                     m_our_geos_factory(new geos::geom::GeometryFactory{m_precision_model.get(), srid}),

include/osmium/geom/geos.hpp

@@ -41,7 +41,6 @@ DEALINGS IN THE SOFTWARE.
 #include <osmium/index/map/sparse_file_array.hpp> // IWYU pragma: keep
 #include <osmium/index/map/sparse_mem_array.hpp>  // IWYU pragma: keep
 #include <osmium/index/map/sparse_mem_map.hpp>    // IWYU pragma: keep
-#include <osmium/index/map/sparse_mem_table.hpp>  // IWYU pragma: keep
 #include <osmium/index/map/sparse_mmap_array.hpp> // IWYU pragma: keep
 
 #endif // OSMIUM_INDEX_MAP_ALL_HPP