From 396d5aa732c14fad8d67a143132eb232a45dd7f2 Mon Sep 17 00:00:00 2001 From: johanengelen Date: Wed, 9 Jan 2008 00:38:16 +0000 Subject: [PATCH] fix compile. rename Proj::FINITE and INFINITE to VP_* because of apparent name clash on windows compile. --- src/axis-manip.h | 4 ++-- src/persp3d.cpp | 2 +- src/widgets/toolbox.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/axis-manip.h b/src/axis-manip.h index e5cc963ba..56306cc05 100644 --- 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 c2bbb5b46..82160d467 100644 --- a/src/persp3d.cpp +++ b/src/persp3d.cpp @@ -329,7 +329,7 @@ persp3d_toggle_VPs (std::set 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 37f122ca7..850018662 100644 --- 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 ) -- 2.30.2