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_bertin1953.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/PJ_bertin1953.cpp') diff --git a/src/PJ_bertin1953.cpp b/src/PJ_bertin1953.cpp index 46420314..a551a6b2 100644 --- a/src/PJ_bertin1953.cpp +++ b/src/PJ_bertin1953.cpp @@ -21,9 +21,11 @@ PROJ_HEAD(bertin1953, "Bertin 1953") "\n\tMisc Sph no inv."; +namespace { // anonymous namespace struct pj_opaque { double cos_delta_phi, sin_delta_phi, cos_delta_gamma, sin_delta_gamma, deltaLambda; }; +} // anonymous namespace static XY s_forward (LP lp, PJ *P) { -- cgit v1.2.3