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_urmfps.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/PJ_urmfps.cpp') diff --git a/src/PJ_urmfps.cpp b/src/PJ_urmfps.cpp index 1d147b9c..848ba4f9 100644 --- a/src/PJ_urmfps.cpp +++ b/src/PJ_urmfps.cpp @@ -9,9 +9,11 @@ PROJ_HEAD(urmfps, "Urmaev Flat-Polar Sinusoidal") "\n\tPCyl, Sph\n\tn="; PROJ_HEAD(wag1, "Wagner I (Kavraisky VI)") "\n\tPCyl, Sph"; +namespace { // anonymous namespace struct pj_opaque { double n, C_y; }; +} // anonymous namespace #define C_x 0.8773826753 #define Cy 1.139753528477 -- cgit v1.2.3