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_misrsom.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/PJ_misrsom.cpp') diff --git a/src/PJ_misrsom.cpp b/src/PJ_misrsom.cpp index 537172c1..3d8adbe9 100644 --- a/src/PJ_misrsom.cpp +++ b/src/PJ_misrsom.cpp @@ -33,10 +33,12 @@ PROJ_HEAD(misrsom, "Space oblique for MISR") #define TOL 1e-7 +namespace { // anonymous namespace struct pj_opaque { double a2, a4, b, c1, c3; double q, t, u, w, p22, sa, ca, xj, rlm, rlm2; }; +} // anonymous namespace static void seraz0(double lam, double mult, PJ *P) { struct pj_opaque *Q = static_cast(P->opaque); -- cgit v1.2.3