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_affine.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/PJ_affine.cpp') diff --git a/src/PJ_affine.cpp b/src/PJ_affine.cpp index b8fa4c68..c53d4e60 100644 --- a/src/PJ_affine.cpp +++ b/src/PJ_affine.cpp @@ -32,6 +32,7 @@ PROJ_HEAD(affine, "Affine transformation"); PROJ_HEAD(geogoffset, "Geographic Offset"); +namespace { // anonymous namespace struct pj_affine_coeffs { double s11; double s12; @@ -44,7 +45,9 @@ struct pj_affine_coeffs { double s33; double tscale; }; +} // anonymous namespace +namespace { // anonymous namespace struct pj_opaque_affine { double xoff; double yoff; @@ -53,6 +56,7 @@ struct pj_opaque_affine { struct pj_affine_coeffs forward; struct pj_affine_coeffs reverse; }; +} // anonymous namespace static PJ_COORD forward_4d(PJ_COORD obs, PJ *P) { -- cgit v1.2.3