From d839e84f9955b6d8055b35d3e3b625016a81d896 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Thu, 14 Jun 2001 22:18:01 +0000
Subject: [PATCH] Cleaned up various warning messages.
---
src/Main/fg_commands.cxx | 28 ++++++++++++++--------------
src/Main/globals.cxx | 4 ++--
src/Main/viewer_lookat.cxx | 2 ++
src/Main/viewer_rph.cxx | 2 ++
4 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index 9303b1772..312b5fd40 100644
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -314,20 +314,20 @@ static struct {
const char * name;
SGCommandMgr::command_t command;
} built_ins [] = {
- "null", do_null,
- "exit", do_exit,
- "load", do_load,
- "save", do_save,
- "panel-load", do_panel_load,
- "preferences-load", do_preferences_load,
- "view-cycle", do_view_cycle,
- "screen-capture", do_screen_capture,
- "property-toggle", do_property_toggle,
- "property-assign", do_property_assign,
- "property-adjust", do_property_adjust,
- "property-swap", do_property_swap,
- "property-scale", do_property_scale,
- 0, 0 // zero-terminated
+ { "null", do_null },
+ { "exit", do_exit },
+ { "load", do_load },
+ { "save", do_save },
+ { "panel-load", do_panel_load },
+ { "preferences-load", do_preferences_load },
+ { "view-cycle", do_view_cycle },
+ { "screen-capture", do_screen_capture },
+ { "property-toggle", do_property_toggle },
+ { "property-assign", do_property_assign },
+ { "property-adjust", do_property_adjust },
+ { "property-swap", do_property_swap },
+ { "property-scale", do_property_scale },
+ { 0, 0 } // zero-terminated
};
diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index ce42e2496..9de7fdb43 100644
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -39,9 +39,9 @@ FGGlobals::FGGlobals() :
freeze( false ),
warp( 0 ),
warp_delta( 0 ),
- commands(new SGCommandMgr),
props(new SGPropertyNode),
- initial_state(0)
+ initial_state(0),
+ commands(new SGCommandMgr)
{
}
diff --git a/src/Main/viewer_lookat.cxx b/src/Main/viewer_lookat.cxx
index 06986973a..e45b0f5bb 100644
--- a/src/Main/viewer_lookat.cxx
+++ b/src/Main/viewer_lookat.cxx
@@ -88,6 +88,7 @@ void fgMakeLookAtMat4 ( sgMat4 dst, const sgVec3 eye, const sgVec3 center,
}
+#if 0
// convert sgMat4 to MAT3 and print
static void print_sgMat4( sgMat4 &in) {
int i, j;
@@ -98,6 +99,7 @@ static void print_sgMat4( sgMat4 &in) {
cout << endl;
}
}
+#endif
// Update the view parameters
diff --git a/src/Main/viewer_rph.cxx b/src/Main/viewer_rph.cxx
index d8ab4c23c..7b6aa6ac2 100644
--- a/src/Main/viewer_rph.cxx
+++ b/src/Main/viewer_rph.cxx
@@ -139,6 +139,7 @@ inline static void fgMakeLOCAL( sgMat4 dst, const double Theta,
#endif
+#if 0
// convert sgMat4 to MAT3 and print
static void print_sgMat4( sgMat4 &in) {
int i, j;
@@ -149,6 +150,7 @@ static void print_sgMat4( sgMat4 &in) {
cout << endl;
}
}
+#endif
// Update the view parameters