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_geos.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/PJ_geos.cpp') diff --git a/src/PJ_geos.cpp b/src/PJ_geos.cpp index ffe0771c..6bf7c3f3 100644 --- a/src/PJ_geos.cpp +++ b/src/PJ_geos.cpp @@ -36,6 +36,7 @@ #include "projects.h" #include "proj_math.h" +namespace { // anonymous namespace struct pj_opaque { double h; double radius_p; @@ -46,6 +47,7 @@ struct pj_opaque { double C; int flip_axis; }; +} // anonymous namespace PROJ_HEAD(geos, "Geostationary Satellite View") "\n\tAzi, Sph&Ell\n\th="; -- cgit v1.2.3