diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-12-18 20:58:28 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-12-26 10:08:53 +0100 |
| commit | 93d8f3a3504c1e92333524aa6aeca169c103166a (patch) | |
| tree | d227a8fe3df6e4d8190a2def84fb6aaedcd72c02 /src/PJ_helmert.cpp | |
| parent | 610957f7035242f15743c399ffd429b92bc36206 (diff) | |
| download | PROJ-93d8f3a3504c1e92333524aa6aeca169c103166a.tar.gz PROJ-93d8f3a3504c1e92333524aa6aeca169c103166a.zip | |
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
Diffstat (limited to 'src/PJ_helmert.cpp')
| -rw-r--r-- | src/PJ_helmert.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/PJ_helmert.cpp b/src/PJ_helmert.cpp index c19422cb..b2072a84 100644 --- a/src/PJ_helmert.cpp +++ b/src/PJ_helmert.cpp @@ -65,6 +65,7 @@ static LPZ helmert_reverse_3d (XYZ xyz, PJ *P); /***********************************************************************/ +namespace { // anonymous namespace struct pj_opaque_helmert { /************************************************************************ Projection specific elements for the "helmert" PJ object @@ -87,6 +88,7 @@ struct pj_opaque_helmert { int no_rotation, exact, fourparam; int is_position_vector; /* 1 = position_vector, 0 = coordinate_frame */ }; +} // anonymous namespace /* Make the maths of the rotation operations somewhat more readable and textbook like */ |