aboutsummaryrefslogtreecommitdiff
path: root/include/proj/util.hpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2020-01-17 00:24:03 +0100
committerEven Rouault <even.rouault@spatialys.com>2020-01-17 00:52:19 +0100
commit4724025e6c817761052fc0dc8810fd489a9e0104 (patch)
tree21117e52f95b8f36880efef8cd71c1fcec21242c /include/proj/util.hpp
parent66fd99a8831955034cb25c8468ecfe1f9d3a7d62 (diff)
parentd76e6202d27c730b4dcbf16b8c1575c11b703485 (diff)
downloadPROJ-4724025e6c817761052fc0dc8810fd489a9e0104.tar.gz
PROJ-4724025e6c817761052fc0dc8810fd489a9e0104.zip
Merge branch 'master' into rfc4_merge_back_master
Diffstat (limited to 'include/proj/util.hpp')
-rw-r--r--include/proj/util.hpp18
1 files changed, 14 insertions, 4 deletions
diff --git a/include/proj/util.hpp b/include/proj/util.hpp
index e4d6c3e0..622709d1 100644
--- a/include/proj/util.hpp
+++ b/include/proj/util.hpp
@@ -166,6 +166,13 @@ namespace proj {}
NS_PROJ_START
+//! @cond Doxygen_Suppress
+namespace io {
+class DatabaseContext;
+using DatabaseContextPtr = std::shared_ptr<DatabaseContext>;
+}
+//! @endcond
+
/** osgeo.proj.util namespace.
*
* \brief A set of base types from ISO 19103, \ref GeoAPI and other PROJ
@@ -342,15 +349,18 @@ class PROJ_GCC_DLL IComparable {
EQUIVALENT_EXCEPT_AXIS_ORDER_GEOGCRS,
};
- PROJ_DLL bool isEquivalentTo(const IComparable *other,
- Criterion criterion = Criterion::STRICT) const;
+ PROJ_DLL bool
+ isEquivalentTo(const IComparable *other,
+ Criterion criterion = Criterion::STRICT,
+ const io::DatabaseContextPtr &dbContext = nullptr) const;
PROJ_PRIVATE :
//! @cond Doxygen_Suppress
PROJ_INTERNAL virtual bool
- _isEquivalentTo(const IComparable *other,
- Criterion criterion = Criterion::STRICT) const = 0;
+ _isEquivalentTo(
+ const IComparable *other, Criterion criterion = Criterion::STRICT,
+ const io::DatabaseContextPtr &dbContext = nullptr) const = 0;
//! @endcond
};