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_wink2.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/PJ_wink2.cpp') diff --git a/src/PJ_wink2.cpp b/src/PJ_wink2.cpp index 9da65eaa..3935372a 100644 --- a/src/PJ_wink2.cpp +++ b/src/PJ_wink2.cpp @@ -7,7 +7,11 @@ PROJ_HEAD(wink2, "Winkel II") "\n\tPCyl, Sph, no inv\n\tlat_1="; -struct pj_opaque { double cosphi1; }; +namespace { // anonymous namespace +struct pj_opaque { + double cosphi1; +}; +} // anonymous namespace #define MAX_ITER 10 #define LOOP_TOL 1e-7 -- cgit v1.2.3