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_eck3.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/PJ_eck3.cpp') diff --git a/src/PJ_eck3.cpp b/src/PJ_eck3.cpp index 7993d781..beaf9357 100644 --- a/src/PJ_eck3.cpp +++ b/src/PJ_eck3.cpp @@ -10,9 +10,11 @@ PROJ_HEAD(putp1, "Putnins P1") "\n\tPCyl, Sph"; PROJ_HEAD(wag6, "Wagner VI") "\n\tPCyl, Sph"; PROJ_HEAD(kav7, "Kavraisky VII") "\n\tPCyl, Sph"; +namespace { // anonymous namespace struct pj_opaque { double C_x, C_y, A, B; }; +} // anonymous namespace static XY s_forward (LP lp, PJ *P) { /* Spheroidal, forward */ -- cgit v1.2.3