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/gie.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/gie.cpp') diff --git a/src/gie.cpp b/src/gie.cpp index 74d78db5..77c21083 100644 --- a/src/gie.cpp +++ b/src/gie.cpp @@ -1020,6 +1020,7 @@ static int dispatch (const char *cmnd, const char *args) { +namespace { // anonymous namespace struct errno_vs_err_const {const char *the_err_const; int the_errno;}; static const struct errno_vs_err_const lookup[] = { {"pjd_err_no_args" , -1}, @@ -1084,6 +1085,7 @@ static const struct errno_vs_err_const lookup[] = { {"pjd_err_unknown" , 9999}, {"pjd_err_enomem" , ENOMEM}, }; +} // anonymous namespace static const struct errno_vs_err_const unknown = {"PJD_ERR_UNKNOWN", 9999}; -- cgit v1.2.3