[Csp-commits] svn:csp r1868 - in trunk/csp: cspsim/f16 modules/demeter

[<sv...@ww...>]

Author: mkrose
Date: 2006-04-01 21:57:19 -0800 (Sat, 01 Apr 2006)
New Revision: 1868

Modified:
   trunk/csp/cspsim/f16/MultiFunctionDisplay.cpp
   trunk/csp/cspsim/f16/MultiFunctionDisplay.h
   trunk/csp/modules/demeter/DemeterDrawable.h
Log:
Add missing include in demeter.
Fix compiler warnings in cspsim/f16.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1868

Modified: trunk/csp/cspsim/f16/MultiFunctionDisplay.cpp
===================================================================
--- trunk/csp/cspsim/f16/MultiFunctionDisplay.cpp	2006-03-16 08:13:58 UTC (rev 1867)
+++ trunk/csp/cspsim/f16/MultiFunctionDisplay.cpp	2006-04-02 05:57:19 UTC (rev 1868)
@@ -356,6 +356,9 @@
 }
 
 
+TextPlacement::~TextPlacement() {
+}
+
 BasePage::BasePage(DisplayLayout *layout): m_Layout(layout), m_Group(new osg::Group) {
 	CSP_VERIFY(layout);
 }

Modified: trunk/csp/cspsim/f16/MultiFunctionDisplay.h
===================================================================
--- trunk/csp/cspsim/f16/MultiFunctionDisplay.h	2006-03-16 08:13:58 UTC (rev 1867)
+++ trunk/csp/cspsim/f16/MultiFunctionDisplay.h	2006-04-02 05:57:19 UTC (rev 1868)
@@ -103,6 +103,7 @@
 class TextPlacement {
 public:
 	virtual void get(DisplayLayout *layout, double &x, double &y, osgText::Text::AlignmentType &alignment) const = 0;
+	virtual ~TextPlacement();
 };
 
 class PlaceOSB: public TextPlacement {

Modified: trunk/csp/modules/demeter/DemeterDrawable.h
===================================================================
--- trunk/csp/modules/demeter/DemeterDrawable.h	2006-03-16 08:13:58 UTC (rev 1867)
+++ trunk/csp/modules/demeter/DemeterDrawable.h	2006-04-02 05:57:19 UTC (rev 1868)
@@ -24,6 +24,7 @@
 
 
 #include <osg/Drawable>
+#include <osg/Geode>
 #include <osg/Version>
 
 // OSG_VERSION_MAJOR was first defined in 0.9.9.