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_sch.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/PJ_sch.cpp') diff --git a/src/PJ_sch.cpp b/src/PJ_sch.cpp index 4a0b1fb8..23b6c4c2 100644 --- a/src/PJ_sch.cpp +++ b/src/PJ_sch.cpp @@ -39,6 +39,7 @@ #include "projects.h" #include "geocent.h" +namespace { // anonymous namespace struct pj_opaque { double plat; /*Peg Latitude */ double plon; /*Peg Longitude*/ @@ -50,6 +51,7 @@ struct pj_opaque { GeocentricInfo sph; GeocentricInfo elp_0; }; +} // anonymous namespace PROJ_HEAD(sch, "Spherical Cross-track Height") "\n\tMisc\n\tplat_0= plon_0= phdg_0= [h_0=]"; -- cgit v1.2.3