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_deformation.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/PJ_deformation.cpp') diff --git a/src/PJ_deformation.cpp b/src/PJ_deformation.cpp index 1398f5fd..49f62c01 100644 --- a/src/PJ_deformation.cpp +++ b/src/PJ_deformation.cpp @@ -63,11 +63,13 @@ PROJ_HEAD(deformation, "Kinematic grid shift"); #define TOL 1e-8 #define MAX_ITERATIONS 10 +namespace { // anonymous namespace struct pj_opaque { double t_obs; double t_epoch; PJ *cart; }; +} // anonymous namespace /********************************************************************************/ static XYZ get_grid_shift(PJ* P, XYZ cartesian) { -- cgit v1.2.3