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_aeqd.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/PJ_aeqd.cpp') diff --git a/src/PJ_aeqd.cpp b/src/PJ_aeqd.cpp index 72c7ae95..69bb76c3 100644 --- a/src/PJ_aeqd.cpp +++ b/src/PJ_aeqd.cpp @@ -32,13 +32,16 @@ #include "projects.h" #include "proj_math.h" +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; @@ -51,6 +54,7 @@ struct pj_opaque { enum Mode mode; struct geod_geodesic g; }; +} // anonymous namespace PROJ_HEAD(aeqd, "Azimuthal Equidistant") "\n\tAzi, Sph&Ell\n\tlat_0 guam"; -- cgit v1.2.3