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

1 files changed, 6 insertions, 0 deletions

diff --git a/src/PJ_qsc.cpp b/src/PJ_qsc.cpp
index 767ed4a8..bca7c4fb 100644
--- a/src/PJ_qsc.cpp
+++ b/src/PJ_qsc.cpp
@@ -46,6 +46,7 @@
 #include "projects.h"
 
 /* The six cube faces. */
+namespace { // anonymous namespace
 enum Face {
     FACE_FRONT  = 0,
     FACE_RIGHT  = 1,
@@ -54,7 +55,9 @@ enum Face {
     FACE_TOP    = 4,
     FACE_BOTTOM = 5
 };
+} // anonymous namespace
 
+namespace { // anonymous namespace
 struct pj_opaque {
         enum Face face;
         double a_squared;
@@ -62,18 +65,21 @@ struct pj_opaque {
         double one_minus_f;
         double one_minus_f_squared;
 };
+} // anonymous namespace
 PROJ_HEAD(qsc, "Quadrilateralized Spherical Cube") "\n\tAzi, Sph";
 
 #define EPS10 1.e-10
 
 /* The four areas on a cube face. AREA_0 is the area of definition,
  * the other three areas are counted counterclockwise. */
+namespace { // anonymous namespace
 enum Area {
     AREA_0 = 0,
     AREA_1 = 1,
     AREA_2 = 2,
     AREA_3 = 3
 };
+} // anonymous namespace
 
 /* Helper function for forward projection: compute the theta angle
  * and determine the area number. */