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_somerc.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_somerc.cpp')
| -rw-r--r-- | src/PJ_somerc.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/PJ_somerc.cpp b/src/PJ_somerc.cpp index 6a98f76f..b82f1a58 100644 --- a/src/PJ_somerc.cpp +++ b/src/PJ_somerc.cpp @@ -8,9 +8,11 @@ PROJ_HEAD(somerc, "Swiss. Obl. Mercator") "\n\tCyl, Ell\n\tFor CH1903"; +namespace { // anonymous namespace struct pj_opaque { double K, c, hlf_e, kR, cosp0, sinp0; }; +} // anonymous namespace #define EPS 1.e-10 #define NITER 6 |