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_wink2.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_wink2.cpp')
| -rw-r--r-- | src/PJ_wink2.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/PJ_wink2.cpp b/src/PJ_wink2.cpp index 9da65eaa..3935372a 100644 --- a/src/PJ_wink2.cpp +++ b/src/PJ_wink2.cpp @@ -7,7 +7,11 @@ PROJ_HEAD(wink2, "Winkel II") "\n\tPCyl, Sph, no inv\n\tlat_1="; -struct pj_opaque { double cosphi1; }; +namespace { // anonymous namespace +struct pj_opaque { + double cosphi1; +}; +} // anonymous namespace #define MAX_ITER 10 #define LOOP_TOL 1e-7 |