[Opal-commits] opal/src Blueprint.cpp,1.16,1.17 Defines.h,1.61,1.62 Logger.h,1.2,1.3 Simulator.cpp,1.38,1.39

[Alan F. <pal...@us...>]

Update of /cvsroot/opal/opal/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6493/src

Modified Files:
	Blueprint.cpp Defines.h Logger.h Simulator.cpp 
Log Message:
VC6 Build is working again.   Minor changes such as not declairing index variables in for loops, and put some warning-disables to make it so the VC6 build doesn't spew the same useless warning everywhere.

Index: Blueprint.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/Blueprint.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Blueprint.cpp	26 Feb 2005 10:22:23 -0000	1.16
--- Blueprint.cpp	28 Feb 2005 03:27:54 -0000	1.17
***************
*** 74,78 ****
  	{
  		// Setup Joint reference indices.
! 		for (size_t i=0; i<mJointList.size();)
  		{
  			JointData* data = mJointList.at(i);
--- 74,79 ----
  	{
  		// Setup Joint reference indices.
! 		size_t i;
! 		for (i=0; i<mJointList.size();)
  		{
  			JointData* data = mJointList.at(i);
***************
*** 102,106 ****
  
  		// Setup Motor reference indices.
! 		for (size_t i=0; i<mMotorList.size();)
  		{
  			MotorData* m = mMotorList.at(i);
--- 103,107 ----
  
  		// Setup Motor reference indices.
! 		for (i=0; i<mMotorList.size();)
  		{
  			MotorData* m = mMotorList.at(i);

Index: Simulator.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/Simulator.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** Simulator.cpp	26 Feb 2005 10:22:23 -0000	1.38
--- Simulator.cpp	28 Feb 2005 03:27:57 -0000	1.39
***************
*** 46,66 ****
  	{
  		// Mark everything as garbage, then collect the garbage.
  
! 		for (size_t i=0; i<mSolidList.size(); ++i)
  		{
  			mSolidGarbageList.push_back(mSolidList[i]);
  		}
  
! 		for (size_t i=0; i<mJointList.size(); ++i)
  		{
  			mJointGarbageList.push_back(mJointList[i]);
  		}
  
! 		for (size_t i=0; i<mMotorList.size(); ++i)
  		{
  			mMotorGarbageList.push_back(mMotorList[i]);
  		}
  
! 		for (size_t i=0; i<mSensorList.size(); ++i)
  		{
  			mSensorGarbageList.push_back(mSensorList[i]);
--- 46,67 ----
  	{
  		// Mark everything as garbage, then collect the garbage.
+ 		size_t i;
  
! 		for (i=0; i<mSolidList.size(); ++i)
  		{
  			mSolidGarbageList.push_back(mSolidList[i]);
  		}
  
! 		for (i=0; i<mJointList.size(); ++i)
  		{
  			mJointGarbageList.push_back(mJointList[i]);
  		}
  
! 		for (i=0; i<mMotorList.size(); ++i)
  		{
  			mMotorGarbageList.push_back(mMotorList[i]);
  		}
  
! 		for (i=0; i<mSensorList.size(); ++i)
  		{
  			mSensorGarbageList.push_back(mSensorList[i]);
***************
*** 264,270 ****
  		std::vector<Solid*> solidList;
  		std::vector<Joint*> jointList;
  
  		// Create all Solids in the Blueprint.
! 		for (int i=0; i<bp.getNumSolids(); ++i)
  		{
  			Solid* s = createSolid();
--- 265,272 ----
  		std::vector<Solid*> solidList;
  		std::vector<Joint*> jointList;
+ 		int i;
  
  		// Create all Solids in the Blueprint.
! 		for (i=0; i<bp.getNumSolids(); ++i)
  		{
  			Solid* s = createSolid();
***************
*** 280,284 ****
  
  		// Create all Joints in the Blueprint.
! 		for (int i=0; i<bp.getNumJoints(); ++i)
  		{
  			// Setup the Solid reference pointers.
--- 282,286 ----
  
  		// Create all Joints in the Blueprint.
! 		for (i=0; i<bp.getNumJoints(); ++i)
  		{
  			// Setup the Solid reference pointers.
***************
*** 299,303 ****
  
  		// Create all Motors in the Blueprint.
! 		for (int i=0; i<bp.getNumMotors(); ++i)
  		{
  			Motor* m = NULL;
--- 301,305 ----
  
  		// Create all Motors in the Blueprint.
! 		for (i=0; i<bp.getNumMotors(); ++i)
  		{
  			Motor* m = NULL;
***************
*** 741,745 ****
  	void Simulator::collectGarbage()
  	{
! 		for (size_t i=0; i<mSolidGarbageList.size(); ++i)
  		{
  			removeSolid(mSolidGarbageList[i]);
--- 743,749 ----
  	void Simulator::collectGarbage()
  	{
! 		size_t i;
! 
! 		for (i=0; i<mSolidGarbageList.size(); ++i)
  		{
  			removeSolid(mSolidGarbageList[i]);
***************
*** 748,752 ****
  		mSolidGarbageList.clear();
  
! 		for (size_t i=0; i<mJointGarbageList.size(); ++i)
  		{
  			removeJoint(mJointGarbageList[i]);
--- 752,756 ----
  		mSolidGarbageList.clear();
  
! 		for (i=0; i<mJointGarbageList.size(); ++i)
  		{
  			removeJoint(mJointGarbageList[i]);
***************
*** 755,759 ****
  		mJointGarbageList.clear();
  
! 		for (size_t i=0; i<mMotorGarbageList.size(); ++i)
  		{
  			removeMotor(mMotorGarbageList[i]);
--- 759,763 ----
  		mJointGarbageList.clear();
  
! 		for (i=0; i<mMotorGarbageList.size(); ++i)
  		{
  			removeMotor(mMotorGarbageList[i]);

Index: Defines.h
===================================================================
RCS file: /cvsroot/opal/opal/src/Defines.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** Defines.h	26 Feb 2005 10:22:23 -0000	1.61
--- Defines.h	28 Feb 2005 03:27:56 -0000	1.62
***************
*** 29,32 ****
--- 29,38 ----
  #define OPAL_DEFINES_H
  
+ // Put this here for now.  They seem to nail all the really annoying and
+ // useless VC6 warning: 4786, Debug info too long
+ #if defined(WIN32) || defined(_WIN32)
+ 	#pragma warning(disable:4786)
+ #endif
+ 
  #include <iostream>
  #include <vector>

Index: Logger.h
===================================================================
RCS file: /cvsroot/opal/opal/src/Logger.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Logger.h	26 Feb 2005 10:22:23 -0000	1.2
--- Logger.h	28 Feb 2005 03:27:56 -0000	1.3
***************
*** 29,32 ****
--- 29,38 ----
  #define OPAL_LOGGER_H
  
+ // Put this here for now.  They seem to nail all the really annoying and
+ // useless VC6 warning: 4786, Debug info too long
+ #if defined(WIN32) || defined(_WIN32)
+ 	#pragma warning(disable:4786)
+ #endif
+ 
  #include <iomanip>
  #include <stdlib.h>
***************
*** 38,42 ****
  #include <stdexcept>
  
! #include "defines.h"
  #include "Singleton.h"
  
--- 44,48 ----
  #include <stdexcept>
  
! #include "Defines.h"
  #include "Singleton.h"