[Csp-commits] svn:csp r2222 - in trunk/csp/tools: layout layout2/cpp

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

Author: nsmoooose
Date: 2008-02-26 11:59:49 -0800 (Tue, 26 Feb 2008)
New Revision: 2222

Modified:
   trunk/csp/tools/layout/FeatureGraph.h
   trunk/csp/tools/layout/LayoutNodes.h
   trunk/csp/tools/layout/View.h
   trunk/csp/tools/layout2/cpp/FeatureGraph.h
   trunk/csp/tools/layout2/cpp/LayoutNodes.h
   trunk/csp/tools/layout2/cpp/Scene.cpp
Log:
Fixes for 64 bit compilation. Contributed by alexr

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

Modified: trunk/csp/tools/layout/FeatureGraph.h
===================================================================
--- trunk/csp/tools/layout/FeatureGraph.h	2008-02-26 19:41:06 UTC (rev 2221)
+++ trunk/csp/tools/layout/FeatureGraph.h	2008-02-26 19:59:49 UTC (rev 2222)
@@ -39,7 +39,7 @@
 	virtual void onRefresh();
 };
 
-typedef int CallbackId;
+typedef size_t CallbackId;
 
 
 /** Class representing the entire layout node graph.  Manages node selection,

Modified: trunk/csp/tools/layout/LayoutNodes.h
===================================================================
--- trunk/csp/tools/layout/LayoutNodes.h	2008-02-26 19:41:06 UTC (rev 2221)
+++ trunk/csp/tools/layout/LayoutNodes.h	2008-02-26 19:59:49 UTC (rev 2222)
@@ -89,7 +89,7 @@
 	virtual void accept(LayoutNodeVisitor &v)=0;
 	virtual void traverse(LayoutNodeVisitor &v)=0;
 
-	unsigned int id() { return reinterpret_cast<unsigned int>(this); }
+	size_t id() { return reinterpret_cast<size_t>(this); }
 
 	virtual void transform(osg::Matrix const &t) {
 		osg::Matrix m = _move->getMatrix();

Modified: trunk/csp/tools/layout/View.h
===================================================================
--- trunk/csp/tools/layout/View.h	2008-02-26 19:41:06 UTC (rev 2221)
+++ trunk/csp/tools/layout/View.h	2008-02-26 19:59:49 UTC (rev 2222)
@@ -52,7 +52,7 @@
 	virtual void onKey(std::string const &) {}
 };
 
-typedef int CallbackId;
+typedef size_t CallbackId;
 
 
 /** View class for the 3D layout.  Contains and provides access to the FeatureGraph

Modified: trunk/csp/tools/layout2/cpp/FeatureGraph.h
===================================================================
--- trunk/csp/tools/layout2/cpp/FeatureGraph.h	2008-02-26 19:41:06 UTC (rev 2221)
+++ trunk/csp/tools/layout2/cpp/FeatureGraph.h	2008-02-26 19:59:49 UTC (rev 2222)
@@ -41,7 +41,7 @@
 	virtual void onRefresh();
 };
 
-typedef int CallbackId;
+typedef size_t CallbackId;
 
 
 /** Class representing the entire layout node graph.  Manages node selection,

Modified: trunk/csp/tools/layout2/cpp/LayoutNodes.h
===================================================================
--- trunk/csp/tools/layout2/cpp/LayoutNodes.h	2008-02-26 19:41:06 UTC (rev 2221)
+++ trunk/csp/tools/layout2/cpp/LayoutNodes.h	2008-02-26 19:59:49 UTC (rev 2222)
@@ -89,7 +89,7 @@
 	virtual void accept(LayoutNodeVisitor &v)=0;
 	virtual void traverse(LayoutNodeVisitor &v)=0;
 
-	unsigned int id() { return reinterpret_cast<unsigned int>(this); }
+	size_t id() { return reinterpret_cast<size_t>(this); }
 
 	virtual void transform(osg::Matrix const &t) {
 		osg::Matrix m = _move->getMatrix();

Modified: trunk/csp/tools/layout2/cpp/Scene.cpp
===================================================================
--- trunk/csp/tools/layout2/cpp/Scene.cpp	2008-02-26 19:41:06 UTC (rev 2221)
+++ trunk/csp/tools/layout2/cpp/Scene.cpp	2008-02-26 19:59:49 UTC (rev 2222)
@@ -74,4 +74,4 @@
 
 csp::layout::FeatureGraph* csp::layout::Scene::graph() {
 	return m_Implementation->m_FeatureGraph;
-}
\ No newline at end of file
+}