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_airy.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/PJ_airy.cpp') diff --git a/src/PJ_airy.cpp b/src/PJ_airy.cpp index 037362b3..fa159bae 100644 --- a/src/PJ_airy.cpp +++ b/src/PJ_airy.cpp @@ -34,13 +34,16 @@ PROJ_HEAD(airy, "Airy") "\n\tMisc Sph, no inv\n\tno_cut lat_b="; +namespace { // anonymous namespace enum Mode { N_POLE = 0, S_POLE = 1, EQUIT = 2, OBLIQ = 3 }; +} // anonymous namespace +namespace { // anonymous namespace struct pj_opaque { double p_halfpi; double sinph0; @@ -49,6 +52,7 @@ struct pj_opaque { enum Mode mode; int no_cut; /* do not cut at hemisphere limit */ }; +} // anonymous namespace # define EPS 1.e-10 -- cgit v1.2.3