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_somerc.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/PJ_somerc.cpp') diff --git a/src/PJ_somerc.cpp b/src/PJ_somerc.cpp index 6a98f76f..b82f1a58 100644 --- a/src/PJ_somerc.cpp +++ b/src/PJ_somerc.cpp @@ -8,9 +8,11 @@ PROJ_HEAD(somerc, "Swiss. Obl. Mercator") "\n\tCyl, Ell\n\tFor CH1903"; +namespace { // anonymous namespace struct pj_opaque { double K, c, hlf_e, kR, cosp0, sinp0; }; +} // anonymous namespace #define EPS 1.e-10 #define NITER 6 -- cgit v1.2.3