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_omerc.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/PJ_omerc.cpp') diff --git a/src/PJ_omerc.cpp b/src/PJ_omerc.cpp index 27b65cc7..dbf90230 100644 --- a/src/PJ_omerc.cpp +++ b/src/PJ_omerc.cpp @@ -33,11 +33,13 @@ PROJ_HEAD(omerc, "Oblique Mercator") "\n\tCyl, Sph&Ell no_rot\n\t" "alpha= [gamma=] [no_off] lonc= or\n\t lon_1= lat_1= lon_2= lat_2="; +namespace { // anonymous namespace struct pj_opaque { double A, B, E, AB, ArB, BrA, rB, singam, cosgam, sinrot, cosrot; double v_pole_n, v_pole_s, u_0; int no_rot; }; +} // anonymous namespace #define TOL 1.e-7 #define EPS 1.e-10 -- cgit v1.2.3