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/projinfo.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/projinfo.cpp') diff --git a/src/projinfo.cpp b/src/projinfo.cpp index 89b42e12..d604365a 100644 --- a/src/projinfo.cpp +++ b/src/projinfo.cpp @@ -56,6 +56,7 @@ using namespace NS_PROJ::internal; // --------------------------------------------------------------------------- +namespace { // anonymous namespace struct OutputOptions { bool quiet = false; bool PROJ5 = false; @@ -69,6 +70,7 @@ struct OutputOptions { bool c_ify = false; bool singleLine = false; }; +} // anonymous namespace // --------------------------------------------------------------------------- -- cgit v1.2.3