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_aea.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/PJ_aea.cpp') diff --git a/src/PJ_aea.cpp b/src/PJ_aea.cpp index e4d1dc4f..88929e3b 100644 --- a/src/PJ_aea.cpp +++ b/src/PJ_aea.cpp @@ -67,6 +67,7 @@ static double phi1_(double qs, double Te, double Tone_es) { } +namespace { // anonymous namespace struct pj_opaque { double ec; double n; @@ -80,6 +81,7 @@ struct pj_opaque { double *en; int ellips; }; +} // anonymous namespace static PJ *destructor (PJ *P, int errlev) { /* Destructor */ -- cgit v1.2.3