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_affine.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_affine.cpp')
| -rw-r--r-- | src/PJ_affine.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/PJ_affine.cpp b/src/PJ_affine.cpp index b8fa4c68..c53d4e60 100644 --- a/src/PJ_affine.cpp +++ b/src/PJ_affine.cpp @@ -32,6 +32,7 @@ PROJ_HEAD(affine, "Affine transformation"); PROJ_HEAD(geogoffset, "Geographic Offset"); +namespace { // anonymous namespace struct pj_affine_coeffs { double s11; double s12; @@ -44,7 +45,9 @@ struct pj_affine_coeffs { double s33; double tscale; }; +} // anonymous namespace +namespace { // anonymous namespace struct pj_opaque_affine { double xoff; double yoff; @@ -53,6 +56,7 @@ struct pj_opaque_affine { struct pj_affine_coeffs forward; struct pj_affine_coeffs reverse; }; +} // anonymous namespace static PJ_COORD forward_4d(PJ_COORD obs, PJ *P) { |