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_oea.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/PJ_oea.cpp') diff --git a/src/PJ_oea.cpp b/src/PJ_oea.cpp index b39e8d5a..0b558f83 100644 --- a/src/PJ_oea.cpp +++ b/src/PJ_oea.cpp @@ -6,12 +6,14 @@ PROJ_HEAD(oea, "Oblated Equal Area") "\n\tMisc Sph\n\tn= m= theta="; +namespace { // anonymous namespace struct pj_opaque { double theta; double m, n; double two_r_m, two_r_n, rm, rn, hm, hn; double cp0, sp0; }; +} // anonymous namespace static XY s_forward (LP lp, PJ *P) { /* Spheroidal, forward */ -- cgit v1.2.3