diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-09-24 13:34:58 +0000 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-09-24 13:35:01 +0000 |
| commit | 3854668626445d20ff28b87fcacadf64f75460a8 (patch) | |
| tree | 3ceec133da40f3fe72ca8d19d41353ac937b6195 /src | |
| parent | 3671063a1c5b158ec332ee1bd68f78d02e08b798 (diff) | |
| download | PROJ-3854668626445d20ff28b87fcacadf64f75460a8.tar.gz PROJ-3854668626445d20ff28b87fcacadf64f75460a8.zip | |
io.cpp: fix build on Solaris
Rename CS template argument, to avoid conflict with macro in Solaris system headers.
Similar to 2f8bd934860b135044c5122e3272f7cc41ba81e7
Diffstat (limited to 'src')
| -rw-r--r-- | src/iso19111/io.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp index ebccf78b..0c414981 100644 --- a/src/iso19111/io.cpp +++ b/src/iso19111/io.cpp @@ -4444,12 +4444,12 @@ class JSONParser { } template <class TargetCRS, class DatumBuilderType, - class CS = CoordinateSystem> + class CSClass = CoordinateSystem> util::nn<std::shared_ptr<TargetCRS>> buildCRS(const json &j, DatumBuilderType f) { auto datum = (this->*f)(getObject(j, "datum")); auto cs = buildCS(getObject(j, "coordinate_system")); - auto csCast = util::nn_dynamic_pointer_cast<CS>(cs); + auto csCast = util::nn_dynamic_pointer_cast<CSClass>(cs); if (!csCast) { throw ParsingException("coordinate_system not of expected type"); } @@ -4457,7 +4457,7 @@ class JSONParser { NN_NO_CHECK(csCast)); } - template <class TargetCRS, class BaseCRS, class CS = CoordinateSystem> + template <class TargetCRS, class BaseCRS, class CSClass = CoordinateSystem> util::nn<std::shared_ptr<TargetCRS>> buildDerivedCRS(const json &j) { auto baseCRSObj = create(getObject(j, "base_crs")); auto baseCRS = util::nn_dynamic_pointer_cast<BaseCRS>(baseCRSObj); @@ -4465,7 +4465,7 @@ class JSONParser { throw ParsingException("base_crs not of expected type"); } auto cs = buildCS(getObject(j, "coordinate_system")); - auto csCast = util::nn_dynamic_pointer_cast<CS>(cs); + auto csCast = util::nn_dynamic_pointer_cast<CSClass>(cs); if (!csCast) { throw ParsingException("coordinate_system not of expected type"); } |
