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_hgridshift.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/PJ_hgridshift.cpp') diff --git a/src/PJ_hgridshift.cpp b/src/PJ_hgridshift.cpp index 86c6cdee..9ed9ca02 100644 --- a/src/PJ_hgridshift.cpp +++ b/src/PJ_hgridshift.cpp @@ -10,10 +10,12 @@ PROJ_HEAD(hgridshift, "Horizontal grid shift"); +namespace { // anonymous namespace struct pj_opaque_hgridshift { double t_final; double t_epoch; }; +} // anonymous namespace static XYZ forward_3d(LPZ lpz, PJ *P) { PJ_COORD point = {{0,0,0,0}}; -- cgit v1.2.3