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_ocea.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/PJ_ocea.cpp') diff --git a/src/PJ_ocea.cpp b/src/PJ_ocea.cpp index 81c506fe..414c296f 100644 --- a/src/PJ_ocea.cpp +++ b/src/PJ_ocea.cpp @@ -8,6 +8,7 @@ PROJ_HEAD(ocea, "Oblique Cylindrical Equal Area") "\n\tCyl, Sph" "lonc= alpha= or\n\tlat_1= lat_2= lon_1= lon_2="; +namespace { // anonymous namespace struct pj_opaque { double rok; double rtk; @@ -16,6 +17,7 @@ struct pj_opaque { double singam; double cosgam; }; +} // anonymous namespace static XY s_forward (LP lp, PJ *P) { /* Spheroidal, forward */ -- cgit v1.2.3