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_gnom.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/PJ_gnom.cpp') diff --git a/src/PJ_gnom.cpp b/src/PJ_gnom.cpp index 7313643f..27e5f925 100644 --- a/src/PJ_gnom.cpp +++ b/src/PJ_gnom.cpp @@ -11,18 +11,22 @@ PROJ_HEAD(gnom, "Gnomonic") "\n\tAzi, Sph"; #define EPS10 1.e-10 +namespace { // anonymous namespace enum Mode { N_POLE = 0, S_POLE = 1, EQUIT = 2, OBLIQ = 3 }; +} // anonymous namespace +namespace { // anonymous namespace struct pj_opaque { double sinph0; double cosph0; enum Mode mode; }; +} // anonymous namespace static XY s_forward (LP lp, PJ *P) { /* Spheroidal, forward */ -- cgit v1.2.3