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_ob_tran.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/PJ_ob_tran.cpp') diff --git a/src/PJ_ob_tran.cpp b/src/PJ_ob_tran.cpp index 1a9417b8..ee1dc465 100644 --- a/src/PJ_ob_tran.cpp +++ b/src/PJ_ob_tran.cpp @@ -7,11 +7,13 @@ #include "proj.h" #include "projects.h" +namespace { // anonymous namespace struct pj_opaque { struct PJconsts *link; double lamp; double cphip, sphip; }; +} // anonymous namespace PROJ_HEAD(ob_tran, "General Oblique Transformation") "\n\tMisc Sph" "\n\to_proj= plus parameters for projection" -- cgit v1.2.3