diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2021-03-03 17:45:53 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2021-03-03 17:45:53 +0100 |
| commit | 095731d53405309c38bebe31af51d141f6319f1a (patch) | |
| tree | efa9f1e916c1c1373298900ac4e66702beec8f35 /include | |
| parent | 9e2eb067585b9a61b2b5e636547ac80dd4d01d06 (diff) | |
| download | PROJ-095731d53405309c38bebe31af51d141f6319f1a.tar.gz PROJ-095731d53405309c38bebe31af51d141f6319f1a.zip | |
Reformat code with clang-format-10 from ubuntu 20.04
Diffstat (limited to 'include')
| -rw-r--r-- | include/proj/common.hpp | 5 | ||||
| -rw-r--r-- | include/proj/coordinateoperation.hpp | 39 | ||||
| -rw-r--r-- | include/proj/io.hpp | 4 | ||||
| -rw-r--r-- | include/proj/util.hpp | 2 |
4 files changed, 25 insertions, 25 deletions
diff --git a/include/proj/common.hpp b/include/proj/common.hpp index cedb94c9..fa957c93 100644 --- a/include/proj/common.hpp +++ b/include/proj/common.hpp @@ -344,8 +344,9 @@ class PROJ_GCC_DLL IdentifiedObject : public util::BaseObject, const io::DatabaseContextPtr &dbContext = nullptr) const override; PROJ_INTERNAL bool _isEquivalentTo( - const IdentifiedObject *other, util::IComparable::Criterion criterion = - util::IComparable::Criterion::STRICT, + const IdentifiedObject *other, + util::IComparable::Criterion criterion = + util::IComparable::Criterion::STRICT, const io::DatabaseContextPtr &dbContext = nullptr) PROJ_PURE_DECL; //! @endcond diff --git a/include/proj/coordinateoperation.hpp b/include/proj/coordinateoperation.hpp index 7868de4d..ede55fed 100644 --- a/include/proj/coordinateoperation.hpp +++ b/include/proj/coordinateoperation.hpp @@ -583,18 +583,18 @@ class PROJ_GCC_DLL SingleOperation : virtual public CoordinateOperation { PROJ_DLL const OperationMethodNNPtr &method() PROJ_PURE_DECL; PROJ_DLL const ParameterValuePtr & - parameterValue(const std::string ¶mName, int epsg_code = 0) const - noexcept; + parameterValue(const std::string ¶mName, + int epsg_code = 0) const noexcept; - PROJ_DLL const ParameterValuePtr ¶meterValue(int epsg_code) const - noexcept; + PROJ_DLL const ParameterValuePtr & + parameterValue(int epsg_code) const noexcept; PROJ_DLL const common::Measure & - parameterValueMeasure(const std::string ¶mName, int epsg_code = 0) const - noexcept; + parameterValueMeasure(const std::string ¶mName, + int epsg_code = 0) const noexcept; - PROJ_DLL const common::Measure ¶meterValueMeasure(int epsg_code) const - noexcept; + PROJ_DLL const common::Measure & + parameterValueMeasure(int epsg_code) const noexcept; PROJ_DLL static SingleOperationNNPtr createPROJBased( const util::PropertyMap &properties, const std::string &PROJString, @@ -612,17 +612,16 @@ class PROJ_GCC_DLL SingleOperation : virtual public CoordinateOperation { //! @cond Doxygen_Suppress PROJ_DLL double - parameterValueNumeric(int epsg_code, - const common::UnitOfMeasure &targetUnit) const - noexcept; + parameterValueNumeric( + int epsg_code, + const common::UnitOfMeasure &targetUnit) const noexcept; - PROJ_INTERNAL double - parameterValueNumeric(const char *param_name, - const common::UnitOfMeasure &targetUnit) const - noexcept; + PROJ_INTERNAL double parameterValueNumeric( + const char *param_name, + const common::UnitOfMeasure &targetUnit) const noexcept; - PROJ_INTERNAL double parameterValueNumericAsSI(int epsg_code) const - noexcept; + PROJ_INTERNAL double + parameterValueNumericAsSI(int epsg_code) const noexcept; PROJ_INTERNAL bool _isEquivalentTo( const util::IComparable *other, @@ -1828,9 +1827,9 @@ class PROJ_GCC_DLL CoordinateOperationContext { IGNORE_GRID_AVAILABILITY, /** Results will be presented as if grids known to PROJ (that is - * registered in the grid_alternatives table of its database) were - * available. Used typically when networking is enabled. - */ + * registered in the grid_alternatives table of its database) were + * available. Used typically when networking is enabled. + */ KNOWN_AVAILABLE, }; diff --git a/include/proj/io.hpp b/include/proj/io.hpp index bc11c220..2f935a0c 100644 --- a/include/proj/io.hpp +++ b/include/proj/io.hpp @@ -711,8 +711,8 @@ class PROJ_GCC_DLL WKTNode { PROJ_DLL void addChild(WKTNodeNNPtr &&child); PROJ_DLL const WKTNodePtr &lookForChild(const std::string &childName, int occurrence = 0) const noexcept; - PROJ_DLL int countChildrenOfName(const std::string &childName) const - noexcept; + PROJ_DLL int + countChildrenOfName(const std::string &childName) const noexcept; PROJ_DLL std::string toString() const; diff --git a/include/proj/util.hpp b/include/proj/util.hpp index 2ada4f79..78115aa1 100644 --- a/include/proj/util.hpp +++ b/include/proj/util.hpp @@ -180,7 +180,7 @@ NS_PROJ_START namespace io { class DatabaseContext; using DatabaseContextPtr = std::shared_ptr<DatabaseContext>; -} +} // namespace io //! @endcond /** osgeo.proj.util namespace. |
