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_eqdc.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/PJ_eqdc.cpp') diff --git a/src/PJ_eqdc.cpp b/src/PJ_eqdc.cpp index 468b16df..7e5cd0da 100644 --- a/src/PJ_eqdc.cpp +++ b/src/PJ_eqdc.cpp @@ -7,6 +7,7 @@ #include "projects.h" #include "proj_math.h" +namespace { // anonymous namespace struct pj_opaque { double phi1; double phi2; @@ -17,6 +18,7 @@ struct pj_opaque { double *en; int ellips; }; +} // anonymous namespace PROJ_HEAD(eqdc, "Equidistant Conic") "\n\tConic, Sph&Ell\n\tlat_1= lat_2="; -- cgit v1.2.3