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_krovak.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/PJ_krovak.cpp') diff --git a/src/PJ_krovak.cpp b/src/PJ_krovak.cpp index 7e0488f0..7728002a 100644 --- a/src/PJ_krovak.cpp +++ b/src/PJ_krovak.cpp @@ -90,6 +90,7 @@ PROJ_HEAD(krovak, "Krovak") "\n\tPCyl, Ell"; /* Not sure at all of the appropriate number for MAX_ITER... */ #define MAX_ITER 100 +namespace { // anonymous namespace struct pj_opaque { double alpha; double k; @@ -98,6 +99,7 @@ struct pj_opaque { double ad; int czech; }; +} // anonymous namespace static XY e_forward (LP lp, PJ *P) { /* Ellipsoidal, forward */ -- cgit v1.2.3