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_mod_ster.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/PJ_mod_ster.cpp') diff --git a/src/PJ_mod_ster.cpp b/src/PJ_mod_ster.cpp index ad5c9cdb..7ef34f0a 100644 --- a/src/PJ_mod_ster.cpp +++ b/src/PJ_mod_ster.cpp @@ -12,11 +12,13 @@ PROJ_HEAD(gs50, "Mod. Stereographic of 50 U.S.") "\n\tAzi(mod)"; #define EPSLN 1e-12 +namespace { // anonymous namespace struct pj_opaque { const COMPLEX *zcoeff; \ double cchio, schio; \ int n; }; +} // anonymous namespace static XY e_forward (LP lp, PJ *P) { /* Ellipsoidal, forward */ -- cgit v1.2.3