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_ccon.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/PJ_ccon.cpp') diff --git a/src/PJ_ccon.cpp b/src/PJ_ccon.cpp index 6ff2d3b1..4ee53133 100644 --- a/src/PJ_ccon.cpp +++ b/src/PJ_ccon.cpp @@ -28,6 +28,7 @@ #define EPS10 1e-10 +namespace { // anonymous namespace struct pj_opaque { double phi1; double ctgphi1; @@ -35,6 +36,7 @@ struct pj_opaque { double cosphi1; double *en; }; +} // anonymous namespace PROJ_HEAD(ccon, "Central Conic") "\n\tCentral Conic, Sph\n\tlat_1="; -- cgit v1.2.3