Merge pull request #3972 from jjimenezshaw/no-copy-axisdirection

Remove copy and move constructors from AxisDirection
OSGeo · Nov 29, 2023 · ce39a39 · ce39a39
2 parents 7786334 + ac37203
commit ce39a39
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/include/proj/coordinatesystem.hpp b/include/proj/coordinatesystem.hpp
@@ -60,6 +60,11 @@ class AxisDirection : public util::CodeList {
     valueOf(const std::string &nameIn) noexcept;
     //! @endcond
 
+    AxisDirection(const AxisDirection&) = delete;
+    AxisDirection& operator=(const AxisDirection&) = delete;
+    AxisDirection(AxisDirection&&) = delete;
+    AxisDirection& operator=(AxisDirection&&) = delete;
+
     PROJ_DLL static const AxisDirection NORTH;
     PROJ_DLL static const AxisDirection NORTH_NORTH_EAST;
     PROJ_DLL static const AxisDirection NORTH_EAST;

diff --git a/src/apps/proj.cpp b/src/apps/proj.cpp
@@ -555,7 +555,7 @@ int main(int argc, char **argv) {
                 try {
                     auto crs = dynamic_cast<const NS_PROJ::crs::ProjectedCRS *>(
                         P->iso_obj.get());
-                    auto dir =
+                    auto& dir =
                         crs->coordinateSystem()->axisList()[0]->direction();
                     swapAxisCrs = dir == NS_PROJ::cs::AxisDirection::NORTH ||
                                   dir == NS_PROJ::cs::AxisDirection::SOUTH;