aboutsummaryrefslogtreecommitdiff
path: root/include/proj/internal/io_internal.hpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2019-02-26 20:30:08 +0100
committerEven Rouault <even.rouault@spatialys.com>2019-02-26 20:30:08 +0100
commit2f8bd934860b135044c5122e3272f7cc41ba81e7 (patch)
tree07e3f393f78ec2bdc0f0eaeebcf1d8013299ecfc /include/proj/internal/io_internal.hpp
parent855f0f3e778de66ba3943ca3ba79606f58b8b887 (diff)
downloadPROJ-2f8bd934860b135044c5122e3272f7cc41ba81e7.tar.gz
PROJ-2f8bd934860b135044c5122e3272f7cc41ba81e7.zip
Rename internal constant to avoid conflict with macro in Solaris system headers
Diffstat (limited to 'include/proj/internal/io_internal.hpp')
-rw-r--r--include/proj/internal/io_internal.hpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/proj/internal/io_internal.hpp b/include/proj/internal/io_internal.hpp
index be6a11bd..3b0e7c0f 100644
--- a/include/proj/internal/io_internal.hpp
+++ b/include/proj/internal/io_internal.hpp
@@ -76,7 +76,8 @@ class WKTConstants {
static const std::string SCALEUNIT;
static const std::string TIMEUNIT;
static const std::string ELLIPSOID;
- static const std::string CS;
+ // underscore, since there is a CS macro in Solaris system headers
+ static const std::string CS_;
static const std::string ID;
static const std::string PROJCRS;
static const std::string BASEGEODCRS;