From ecea0e3c5937cda326eaa0d499983f807c49f1ab Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 24 Sep 2019 15:34:58 +0200
Subject: io.cpp: fix build on Solaris

Rename CS template argument, to avoid conflict with macro in Solaris system headers.

Similar to 2f8bd934860b135044c5122e3272f7cc41ba81e7
---
 src/iso19111/io.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp
index 550312d8..b316d094 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");
         }
-- 
cgit v1.2.3