diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-01-17 21:15:24 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-01-17 21:15:24 +0100 |
| commit | 3fc48e6146e020b86a0ef87749cc645f9b4fa113 (patch) | |
| tree | 810b23b6de2e775eca03eafd81ff659a8a0319a0 /include/proj/datum.hpp | |
| parent | 6d2af0904652baba69ec81261c914e9b68221dac (diff) | |
| download | PROJ-3fc48e6146e020b86a0ef87749cc645f9b4fa113.tar.gz PROJ-3fc48e6146e020b86a0ef87749cc645f9b4fa113.zip | |
Remove wrong use of PROJ_CONST_DECL and replace it with PROJ_PURE_DECL (fixes #1224)
Diffstat (limited to 'include/proj/datum.hpp')
| -rw-r--r-- | include/proj/datum.hpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/proj/datum.hpp b/include/proj/datum.hpp index 6e60c47c..17c4c2c1 100644 --- a/include/proj/datum.hpp +++ b/include/proj/datum.hpp @@ -177,7 +177,7 @@ class PROJ_GCC_DLL PrimeMeridian final : public common::IdentifiedObject, PROJ_DLL ~PrimeMeridian() override; //! @endcond - PROJ_DLL const common::Angle &longitude() PROJ_CONST_DECL; + PROJ_DLL const common::Angle &longitude() PROJ_PURE_DECL; // non-standard PROJ_DLL static PrimeMeridianNNPtr @@ -249,25 +249,25 @@ class PROJ_GCC_DLL Ellipsoid final : public common::IdentifiedObject, PROJ_DLL ~Ellipsoid() override; //! @endcond - PROJ_DLL const common::Length &semiMajorAxis() PROJ_CONST_DECL; + PROJ_DLL const common::Length &semiMajorAxis() PROJ_PURE_DECL; // Inlined from SecondDefiningParameter union PROJ_DLL const util::optional<common::Scale> & - inverseFlattening() PROJ_CONST_DECL; + inverseFlattening() PROJ_PURE_DECL; PROJ_DLL const util::optional<common::Length> & - semiMinorAxis() PROJ_CONST_DECL; - PROJ_DLL bool isSphere() PROJ_CONST_DECL; + semiMinorAxis() PROJ_PURE_DECL; + PROJ_DLL bool isSphere() PROJ_PURE_DECL; PROJ_DLL const util::optional<common::Length> & - semiMedianAxis() PROJ_CONST_DECL; + semiMedianAxis() PROJ_PURE_DECL; // non-standard - PROJ_DLL double computedInverseFlattening() PROJ_CONST_DECL; - PROJ_DLL double squaredEccentricity() PROJ_CONST_DECL; + PROJ_DLL double computedInverseFlattening() PROJ_PURE_DECL; + PROJ_DLL double squaredEccentricity() PROJ_PURE_DECL; PROJ_DLL common::Length computeSemiMinorAxis() const; - PROJ_DLL const std::string &celestialBody() PROJ_CONST_DECL; + PROJ_DLL const std::string &celestialBody() PROJ_PURE_DECL; PROJ_DLL static const std::string EARTH; @@ -377,11 +377,11 @@ class PROJ_GCC_DLL GeodeticReferenceFrame : public Datum { PROJ_DLL ~GeodeticReferenceFrame() override; //! @endcond - PROJ_DLL const PrimeMeridianNNPtr &primeMeridian() PROJ_CONST_DECL; + PROJ_DLL const PrimeMeridianNNPtr &primeMeridian() PROJ_PURE_DECL; // We constraint more than the standard into which the ellipsoid might // be omitted for a CRS with a non-ellipsoidal CS - PROJ_DLL const EllipsoidNNPtr &ellipsoid() PROJ_CONST_DECL; + PROJ_DLL const EllipsoidNNPtr &ellipsoid() PROJ_PURE_DECL; // non-standard PROJ_DLL static GeodeticReferenceFrameNNPtr |