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/proj_rouss.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/proj_rouss.cpp') diff --git a/src/proj_rouss.cpp b/src/proj_rouss.cpp index f39e0a15..f4fa084f 100644 --- a/src/proj_rouss.cpp +++ b/src/proj_rouss.cpp @@ -31,6 +31,7 @@ #include "proj.h" #include "projects.h" +namespace { // anonymous namespace struct pj_opaque { double s0; double A1, A2, A3, A4, A5, A6; @@ -39,6 +40,7 @@ struct pj_opaque { double D1, D2, D3, D4, D5, D6, D7, D8, D9, D10, D11; void *en; }; +} // anonymous namespace PROJ_HEAD(rouss, "Roussilhe Stereographic") "\n\tAzi, Ell"; -- cgit v1.2.3