← Back to team overview

yade-dev team mailing list archive

[Branch ~yade-dev/yade/trunk] Rev 3023: Fix of previous commit

 

------------------------------------------------------------
revno: 3023
committer: Jan Stransky <_honzik@xxxxxxxxxx>
branch nick: yade
timestamp: Mon 2012-02-13 12:17:02 +0100
message:
  Fix of previous commit
modified:
  core/Omega.cpp
  core/Omega.hpp


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription
=== modified file 'core/Omega.cpp'
--- core/Omega.cpp	2012-02-13 10:36:56 +0000
+++ core/Omega.cpp	2012-02-13 11:17:02 +0000
@@ -61,8 +61,8 @@
 	scenes.push_back(shared_ptr<Scene>(new Scene));
 	return scenes.size()-1;
 }
-void Omega::switchToScene(unsigned int i) {
-	if (i<0 || i>=scenes.size()) {
+void Omega::switchToScene(int i) {
+	if (i<0 || i>=int(scenes.size())) {
 		LOG_ERROR("Scene "<<i<<" has not been created yet, no switch.");
 		return;
 	}

=== modified file 'core/Omega.hpp'
--- core/Omega.hpp	2012-02-13 10:36:56 +0000
+++ core/Omega.hpp	2012-02-13 11:17:02 +0000
@@ -64,7 +64,7 @@
 	void buildDynlibDatabase(const vector<string>& dynlibsList); // FIXME - maybe in ClassFactory ?
 	
 	vector<shared_ptr<Scene> > scenes;
-	unsigned int currentSceneNb;
+	int currentSceneNb;
 	shared_ptr<Scene> sceneAnother; // used for temporarily running different simulation, in Omega().switchscene()
 
 	ptime startupLocalTime;