fix compile. rename Proj::FINITE and INFINITE to VP_* because of apparent name clash...

diff --git a/src/axis-manip.h b/src/axis-manip.h
index e5cc963ba2614d95f406dad307a24c34c9dfb706..56306cc056e4dc7aa9385690a074c848faa58aa4 100644 (file)
--- a/src/axis-manip.h
+++ b/src/axis-manip.h
@@ -18,8 +18,8 @@
 namespace Proj {
 
 enum VPState {
-    FINITE = 0,
-    INFINITE
+    VP_FINITE = 0,
+    VP_INFINITE
 };
 
 // The X-/Y-/Z-axis corresponds to the first/second/third digit

diff --git a/src/persp3d.cpp b/src/persp3d.cpp
index c2bbb5b46984328873dcf7f4990fdf3b628fd7f5..82160d46708c7228df710a99491e7aa69f2691ce 100644 (file)
--- a/src/persp3d.cpp
+++ b/src/persp3d.cpp
@@ -329,7 +329,7 @@ persp3d_toggle_VPs (std::set<Persp3D *> p, Proj::Axis axis) {
 
 void
 persp3d_set_VP_state (Persp3D *persp, Proj::Axis axis, Proj::VPState state) {
-    if (persp3d_VP_is_finite(persp, axis) != (state == Proj::FINITE)) {
+    if (persp3d_VP_is_finite(persp, axis) != (state == Proj::VP_FINITE)) {
         persp3d_toggle_VP(persp, axis);
     }
 }

diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 37f122ca7d82718493d4c74faa6f2463b9f35e65..85001866295994233b09c9fdf26607cda7b68afb 100644 (file)
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -2544,7 +2544,7 @@ static void box3d_vp_state_changed( GtkToggleAction *act, GtkAction *box3d_angle
     Persp3D *persp = *(sel_persps.begin());
 
     bool set_infinite = gtk_toggle_action_get_active(act);
-    persp3d_set_VP_state (persp, axis, set_infinite ? Proj::INFINITE : Proj::FINITE);
+    persp3d_set_VP_state (persp, axis, set_infinite ? Proj::VP_INFINITE : Proj::VP_FINITE);
 }
 
 static void box3d_vp_x_state_changed( GtkToggleAction *act, GtkAction *box3d_angle )