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_stere.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/PJ_stere.cpp') diff --git a/src/PJ_stere.cpp b/src/PJ_stere.cpp index 94e7f91d..58d5858d 100644 --- a/src/PJ_stere.cpp +++ b/src/PJ_stere.cpp @@ -8,13 +8,16 @@ PROJ_HEAD(stere, "Stereographic") "\n\tAzi, Sph&Ell\n\tlat_ts="; PROJ_HEAD(ups, "Universal Polar Stereographic") "\n\tAzi, Sph&Ell\n\tsouth"; +namespace { // anonymous namespace enum Mode { S_POLE = 0, N_POLE = 1, OBLIQ = 2, EQUIT = 3 }; +} // anonymous namespace +namespace { // anonymous namespace struct pj_opaque { double phits; double sinX1; @@ -22,6 +25,7 @@ struct pj_opaque { double akm1; enum Mode mode; }; +} // anonymous namespace #define sinph0 static_cast(P->opaque)->sinX1 #define cosph0 static_cast(P->opaque)->cosX1 -- cgit v1.2.3