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_stere.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_stere.cpp')
| -rw-r--r-- | src/PJ_stere.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/PJ_stere.cpp b/src/PJ_stere.cpp index 94e7f91d..58d5858d 100644 --- a/src/PJ_stere.cpp +++ b/src/PJ_stere.cpp @@ -8,13 +8,16 @@ PROJ_HEAD(stere, "Stereographic") "\n\tAzi, Sph&Ell\n\tlat_ts="; PROJ_HEAD(ups, "Universal Polar Stereographic") "\n\tAzi, Sph&Ell\n\tsouth"; +namespace { // anonymous namespace enum Mode { S_POLE = 0, N_POLE = 1, OBLIQ = 2, EQUIT = 3 }; +} // anonymous namespace +namespace { // anonymous namespace struct pj_opaque { double phits; double sinX1; @@ -22,6 +25,7 @@ struct pj_opaque { double akm1; enum Mode mode; }; +} // anonymous namespace #define sinph0 static_cast<struct pj_opaque*>(P->opaque)->sinX1 #define cosph0 static_cast<struct pj_opaque*>(P->opaque)->cosX1 |