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_aitoff.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/PJ_aitoff.cpp') diff --git a/src/PJ_aitoff.cpp b/src/PJ_aitoff.cpp index 1af75469..ba1402a4 100644 --- a/src/PJ_aitoff.cpp +++ b/src/PJ_aitoff.cpp @@ -37,15 +37,19 @@ #include "projects.h" +namespace { // anonymous namespace enum Mode { AITOFF = 0, WINKEL_TRIPEL = 1 }; +} // anonymous namespace +namespace { // anonymous namespace struct pj_opaque { double cosphi1; enum Mode mode; }; +} // anonymous namespace PROJ_HEAD(aitoff, "Aitoff") "\n\tMisc Sph"; -- cgit v1.2.3