From 93d8f3a3504c1e92333524aa6aeca169c103166a Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 18 Dec 2018 20:58:28 +0100 Subject: 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 --- src/PJ_lcc.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/PJ_lcc.cpp') diff --git a/src/PJ_lcc.cpp b/src/PJ_lcc.cpp index 5c430ea0..9483c085 100644 --- a/src/PJ_lcc.cpp +++ b/src/PJ_lcc.cpp @@ -9,6 +9,7 @@ PROJ_HEAD(lcc, "Lambert Conformal Conic") #define EPS10 1.e-10 +namespace { // anonymous namespace struct pj_opaque { double phi1; double phi2; @@ -16,6 +17,7 @@ struct pj_opaque { double rho0; double c; }; +} // anonymous namespace static XY e_forward (LP lp, PJ *P) { /* Ellipsoidal, forward */ -- cgit v1.2.3