aboutsummaryrefslogtreecommitdiff
path: root/src/PJ_sch.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2018-12-18 20:58:28 +0100
committerEven Rouault <even.rouault@spatialys.com>2018-12-26 10:08:53 +0100
commit93d8f3a3504c1e92333524aa6aeca169c103166a (patch)
treed227a8fe3df6e4d8190a2def84fb6aaedcd72c02 /src/PJ_sch.cpp
parent610957f7035242f15743c399ffd429b92bc36206 (diff)
downloadPROJ-93d8f3a3504c1e92333524aa6aeca169c103166a.tar.gz
PROJ-93d8f3a3504c1e92333524aa6aeca169c103166a.zip
cpp conversion: fix One-Definition-Rule violations
Defining struct pj_opaque with different definitions is a violation of the C++ One-Definition-Rule. When using link-time optimizations, this could break badly. The solution adopted here is to wrap those structures into a C++ anonymous namespace so they are considered different
Diffstat (limited to 'src/PJ_sch.cpp')
-rw-r--r--src/PJ_sch.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/PJ_sch.cpp b/src/PJ_sch.cpp
index 4a0b1fb8..23b6c4c2 100644
--- a/src/PJ_sch.cpp
+++ b/src/PJ_sch.cpp
@@ -39,6 +39,7 @@
#include "projects.h"
#include "geocent.h"
+namespace { // anonymous namespace
struct pj_opaque {
double plat; /*Peg Latitude */
double plon; /*Peg Longitude*/
@@ -50,6 +51,7 @@ struct pj_opaque {
GeocentricInfo sph;
GeocentricInfo elp_0;
};
+} // anonymous namespace
PROJ_HEAD(sch, "Spherical Cross-track Height") "\n\tMisc\n\tplat_0= plon_0= phdg_0= [h_0=]";