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_robin.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/PJ_robin.cpp') diff --git a/src/PJ_robin.cpp b/src/PJ_robin.cpp index 19bdc2dc..987977ae 100644 --- a/src/PJ_robin.cpp +++ b/src/PJ_robin.cpp @@ -18,9 +18,11 @@ http://article.gmane.org/gmane.comp.gis.proj-4.devel/6039 http://trac.osgeo.org/proj/ticket/113 */ +namespace { // anonymous namespace struct COEFS { float c0, c1, c2, c3; }; +} // anonymous namespace static const struct COEFS X[] = { {1.0f, 2.2199e-17f, -7.15515e-05f, 3.1103e-06f}, -- cgit v1.2.3