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_labrd.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/PJ_labrd.cpp') diff --git a/src/PJ_labrd.cpp b/src/PJ_labrd.cpp index e40bbcbd..c72aeb93 100644 --- a/src/PJ_labrd.cpp +++ b/src/PJ_labrd.cpp @@ -8,9 +8,11 @@ PROJ_HEAD(labrd, "Laborde") "\n\tCyl, Sph\n\tSpecial for Madagascar"; #define EPS 1.e-10 +namespace { // anonymous namespace struct pj_opaque { double kRg, p0s, A, C, Ca, Cb, Cc, Cd; }; +} // anonymous namespace static XY e_forward (LP lp, PJ *P) { /* Ellipsoidal, forward */ -- cgit v1.2.3