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_igh.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/PJ_igh.cpp') diff --git a/src/PJ_igh.cpp b/src/PJ_igh.cpp index 476d1c6b..60f5a4e8 100644 --- a/src/PJ_igh.cpp +++ b/src/PJ_igh.cpp @@ -32,10 +32,12 @@ static const double d180 = 180 * DEG_TO_RAD; static const double EPSLN = 1.e-10; /* allow a little 'slack' on zone edge positions */ +namespace { // anonymous namespace struct pj_opaque { struct PJconsts* pj[12]; \ double dy0; }; +} // anonymous namespace static XY s_forward (LP lp, PJ *P) { /* Spheroidal, forward */ -- cgit v1.2.3