aboutsummaryrefslogtreecommitdiff
path: root/src/PJ_chamb.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_chamb.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_chamb.cpp')
-rw-r--r--src/PJ_chamb.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/PJ_chamb.cpp b/src/PJ_chamb.cpp
index 8d8f05ee..0da3899b 100644
--- a/src/PJ_chamb.cpp
+++ b/src/PJ_chamb.cpp
@@ -7,6 +7,7 @@
#include "projects.h"
typedef struct { double r, Az; } VECT;
+namespace { // anonymous namespace
struct pj_opaque {
struct { /* control point data */
double phi, lam;
@@ -18,6 +19,7 @@ struct pj_opaque {
XY p;
double beta_0, beta_1, beta_2;
};
+} // anonymous namespace
PROJ_HEAD(chamb, "Chamberlin Trimetric") "\n\tMisc Sph, no inv"
"\n\tlat_1= lon_1= lat_2= lon_2= lat_3= lon_3=";