[Opal-commits] opal/src AccelerationSensor.cpp,1.1,1.2 AccelerationSensor.h,1.1,1.2 AttractorMotor.cpp,1.20,1.21 AttractorMotor.h,1.27,1.28 GearedMotor.cpp,1.10,1.11 GearedMotor.h,1.10,1.11 Joint.cpp,1.27,1.28 Joint.h,1.65,1.66 Motor.cpp,1.16,1.17 Motor.h,1.37,1.38 RaycastSensor.cpp,1.6,1.7 RaycastSensor.h,1.5,1.6 Sensor.cpp,1.5,1.6 Sensor.h,1.9,1.10 ServoMotor.cpp,1.14,1.15 ServoMotor.h,1.24,1.25 Simulator.cpp,1.49,1.50 SpringMotor.cpp,1.9,1.10 SpringMotor.h,1.11,1.12 ThrusterMotor.cpp,1.10,1.11 ThrusterMotor.h,1.12,1.13 VelocitySensor.cpp,1.1,1.2 VelocitySensor.h,1.1,1.2 VolumeSensor.cpp,1.3,1.4 VolumeSensor.h,1.4,1.5

[tylerstreeter <tyl...@us...>]

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

Modified Files:
	AccelerationSensor.cpp AccelerationSensor.h AttractorMotor.cpp 
	AttractorMotor.h GearedMotor.cpp GearedMotor.h Joint.cpp 
	Joint.h Motor.cpp Motor.h RaycastSensor.cpp RaycastSensor.h 
	Sensor.cpp Sensor.h ServoMotor.cpp ServoMotor.h Simulator.cpp 
	SpringMotor.cpp SpringMotor.h ThrusterMotor.cpp 
	ThrusterMotor.h VelocitySensor.cpp VelocitySensor.h 
	VolumeSensor.cpp VolumeSensor.h 
Log Message:
renamed overloaded internal_dependsOn functions to avoid gcc and mipspro compiler warnings

Index: Sensor.h
===================================================================
RCS file: /cvsroot/opal/opal/src/Sensor.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Sensor.h	14 Mar 2005 01:20:53 -0000	1.9
--- Sensor.h	23 Mar 2005 04:04:30 -0000	1.10
***************
*** 83,87 ****
  
  		/// Returns true if this Sensor depends on the given Solid.  
! 		virtual bool OPAL_CALL internal_dependsOn(Solid* solid);
  
  	protected:
--- 83,87 ----
  
  		/// Returns true if this Sensor depends on the given Solid.  
! 		virtual bool OPAL_CALL internal_dependsOnSolid(Solid* s);
  
  	protected:

Index: AccelerationSensor.h
===================================================================
RCS file: /cvsroot/opal/opal/src/AccelerationSensor.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AccelerationSensor.h	14 Mar 2005 05:18:27 -0000	1.1
--- AccelerationSensor.h	23 Mar 2005 04:04:30 -0000	1.2
***************
*** 83,87 ****
  		virtual void OPAL_CALL internal_update();
  
! 		virtual bool OPAL_CALL internal_dependsOn(Solid* solid);
  
  	protected:
--- 83,87 ----
  		virtual void OPAL_CALL internal_update();
  
! 		virtual bool OPAL_CALL internal_dependsOnSolid(Solid* s);
  
  	protected:

Index: Motor.h
===================================================================
RCS file: /cvsroot/opal/opal/src/Motor.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** Motor.h	9 Mar 2005 02:09:49 -0000	1.37
--- Motor.h	23 Mar 2005 04:04:30 -0000	1.38
***************
*** 82,89 ****
  
  		/// Returns true if this Motor depends on the given Solid.  
! 		virtual bool OPAL_CALL internal_dependsOn(Solid* solid);
  
  		/// Returns true if this Motor depends on the given Joint.  
! 		virtual bool OPAL_CALL internal_dependsOn(Joint* joint);
  
  		/// Sets whether this is a custom Motor.  Used internally to 
--- 82,89 ----
  
  		/// Returns true if this Motor depends on the given Solid.  
! 		virtual bool OPAL_CALL internal_dependsOnSolid(Solid* s);
  
  		/// Returns true if this Motor depends on the given Joint.  
! 		virtual bool OPAL_CALL internal_dependsOnJoint(Joint* j);
  
  		/// Sets whether this is a custom Motor.  Used internally to 

Index: Sensor.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/Sensor.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Sensor.cpp	9 Mar 2005 02:09:49 -0000	1.5
--- Sensor.cpp	23 Mar 2005 04:04:30 -0000	1.6
***************
*** 55,59 ****
  	}
  
! 	bool Sensor::internal_dependsOn(Solid* solid)
  	{
  		return false;
--- 55,59 ----
  	}
  
! 	bool Sensor::internal_dependsOnSolid(Solid* s)
  	{
  		return false;

Index: RaycastSensor.h
===================================================================
RCS file: /cvsroot/opal/opal/src/RaycastSensor.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** RaycastSensor.h	14 Mar 2005 05:18:27 -0000	1.5
--- RaycastSensor.h	23 Mar 2005 04:04:30 -0000	1.6
***************
*** 137,141 ****
  		virtual void OPAL_CALL internal_update();
  
! 		virtual bool OPAL_CALL internal_dependsOn(Solid* solid);
  
  	protected:
--- 137,141 ----
  		virtual void OPAL_CALL internal_update();
  
! 		virtual bool OPAL_CALL internal_dependsOnSolid(Solid* s);
  
  	protected:

Index: SpringMotor.h
===================================================================
RCS file: /cvsroot/opal/opal/src/SpringMotor.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SpringMotor.h	9 Mar 2005 02:09:50 -0000	1.11
--- SpringMotor.h	23 Mar 2005 04:04:31 -0000	1.12
***************
*** 105,109 ****
  		virtual void OPAL_CALL internal_update();
  
! 		virtual bool OPAL_CALL internal_dependsOn(Solid* solid);
  
  	protected:
--- 105,109 ----
  		virtual void OPAL_CALL internal_update();
  
! 		virtual bool OPAL_CALL internal_dependsOnSolid(Solid* s);
  
  	protected:

Index: ThrusterMotor.h
===================================================================
RCS file: /cvsroot/opal/opal/src/ThrusterMotor.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ThrusterMotor.h	9 Mar 2005 02:09:50 -0000	1.12
--- ThrusterMotor.h	23 Mar 2005 04:04:31 -0000	1.13
***************
*** 77,81 ****
  		virtual const Force& OPAL_CALL getForce()const;
  
! 		virtual bool OPAL_CALL internal_dependsOn(Solid* solid);
  
  		virtual void OPAL_CALL internal_update();
--- 77,81 ----
  		virtual const Force& OPAL_CALL getForce()const;
  
! 		virtual bool OPAL_CALL internal_dependsOnSolid(Solid* s);
  
  		virtual void OPAL_CALL internal_update();

Index: Motor.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/Motor.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Motor.cpp	9 Mar 2005 02:09:49 -0000	1.16
--- Motor.cpp	23 Mar 2005 04:04:30 -0000	1.17
***************
*** 56,65 ****
  	}
  
! 	bool Motor::internal_dependsOn(Solid* solid)
  	{
  		return false;
  	}
  
! 	bool Motor::internal_dependsOn(Joint* joint)
  	{
  		return false;
--- 56,65 ----
  	}
  
! 	bool Motor::internal_dependsOnSolid(Solid* s)
  	{
  		return false;
  	}
  
! 	bool Motor::internal_dependsOnJoint(Joint* j)
  	{
  		return false;

Index: AccelerationSensor.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/AccelerationSensor.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AccelerationSensor.cpp	14 Mar 2005 05:18:27 -0000	1.1
--- AccelerationSensor.cpp	23 Mar 2005 04:04:30 -0000	1.2
***************
*** 159,165 ****
  	}
  
! 	bool AccelerationSensor::internal_dependsOn(Solid* solid)
  	{
! 		if (solid == mData.solid)
  		{
  			return true;
--- 159,165 ----
  	}
  
! 	bool AccelerationSensor::internal_dependsOnSolid(Solid* s)
  	{
! 		if (s == mData.solid)
  		{
  			return true;

Index: GearedMotor.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/GearedMotor.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** GearedMotor.cpp	9 Mar 2005 02:09:49 -0000	1.10
--- GearedMotor.cpp	23 Mar 2005 04:04:30 -0000	1.11
***************
*** 143,149 ****
  	}
  
! 	bool GearedMotor::internal_dependsOn(Joint* joint)
  	{
! 		if (joint == mData.joint)
  		{
  			return true;
--- 143,149 ----
  	}
  
! 	bool GearedMotor::internal_dependsOnJoint(Joint* j)
  	{
! 		if (j == mData.joint)
  		{
  			return true;

Index: ServoMotor.h
===================================================================
RCS file: /cvsroot/opal/opal/src/ServoMotor.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ServoMotor.h	9 Mar 2005 02:09:49 -0000	1.24
--- ServoMotor.h	23 Mar 2005 04:04:30 -0000	1.25
***************
*** 105,109 ****
  		virtual void OPAL_CALL internal_update();
  
! 		virtual bool OPAL_CALL internal_dependsOn(Joint* joint);
  
  	protected:
--- 105,109 ----
  		virtual void OPAL_CALL internal_update();
  
! 		virtual bool OPAL_CALL internal_dependsOnJoint(Joint* j);
  
  	protected:

Index: AttractorMotor.h
===================================================================
RCS file: /cvsroot/opal/opal/src/AttractorMotor.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** AttractorMotor.h	9 Mar 2005 02:09:49 -0000	1.27
--- AttractorMotor.h	23 Mar 2005 04:04:30 -0000	1.28
***************
*** 84,88 ****
  		virtual void OPAL_CALL internal_update();
  
! 		virtual bool OPAL_CALL internal_dependsOn(Solid* solid);
  
  	protected:
--- 84,88 ----
  		virtual void OPAL_CALL internal_update();
  
! 		virtual bool OPAL_CALL internal_dependsOnSolid(Solid* s);
  
  	protected:

Index: ThrusterMotor.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/ThrusterMotor.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ThrusterMotor.cpp	9 Mar 2005 02:09:50 -0000	1.10
--- ThrusterMotor.cpp	23 Mar 2005 04:04:31 -0000	1.11
***************
*** 110,116 ****
  	}
  
! 	bool ThrusterMotor::internal_dependsOn(Solid* solid)
  	{
! 		if (solid == mData.solid)
  		{
  			return true;
--- 110,116 ----
  	}
  
! 	bool ThrusterMotor::internal_dependsOnSolid(Solid* s)
  	{
! 		if (s == mData.solid)
  		{
  			return true;

Index: VelocitySensor.h
===================================================================
RCS file: /cvsroot/opal/opal/src/VelocitySensor.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VelocitySensor.h	14 Mar 2005 05:18:27 -0000	1.1
--- VelocitySensor.h	23 Mar 2005 04:04:31 -0000	1.2
***************
*** 85,89 ****
  		virtual void OPAL_CALL internal_update();
  
! 		virtual bool OPAL_CALL internal_dependsOn(Solid* solid);
  
  	protected:
--- 85,89 ----
  		virtual void OPAL_CALL internal_update();
  
! 		virtual bool OPAL_CALL internal_dependsOnSolid(Solid* s);
  
  	protected:

Index: VelocitySensor.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/VelocitySensor.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VelocitySensor.cpp	14 Mar 2005 05:18:27 -0000	1.1
--- VelocitySensor.cpp	23 Mar 2005 04:04:31 -0000	1.2
***************
*** 159,165 ****
  	}
  
! 	bool VelocitySensor::internal_dependsOn(Solid* solid)
  	{
! 		if (solid == mData.solid)
  		{
  			return true;
--- 159,165 ----
  	}
  
! 	bool VelocitySensor::internal_dependsOnSolid(Solid* s)
  	{
! 		if (s == mData.solid)
  		{
  			return true;

Index: Simulator.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/Simulator.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** Simulator.cpp	21 Mar 2005 16:31:22 -0000	1.49
--- Simulator.cpp	23 Mar 2005 04:04:30 -0000	1.50
***************
*** 894,898 ****
  		for (iter = mMotorList.begin(); iter != mMotorList.end(); ++iter)
  		{
! 			if ((*iter)->internal_dependsOn(s))
  			{
  				(*iter)->setEnabled(false);
--- 894,898 ----
  		for (iter = mMotorList.begin(); iter != mMotorList.end(); ++iter)
  		{
! 			if ((*iter)->internal_dependsOnSolid(s))
  			{
  				(*iter)->setEnabled(false);
***************
*** 904,908 ****
  		for (iter2 = mJointList.begin(); iter2 != mJointList.end(); ++iter2)
  		{
! 			if ((*iter2)->internal_dependsOn(s))
  			{
  				(*iter2)->setEnabled(false);
--- 904,908 ----
  		for (iter2 = mJointList.begin(); iter2 != mJointList.end(); ++iter2)
  		{
! 			if ((*iter2)->internal_dependsOnSolid(s))
  			{
  				(*iter2)->setEnabled(false);
***************
*** 914,918 ****
  		for (iter3 = mSensorList.begin(); iter3 != mSensorList.end(); ++iter3)
  		{
! 			if ((*iter3)->internal_dependsOn(s))
  			{
  				(*iter3)->setEnabled(false);
--- 914,918 ----
  		for (iter3 = mSensorList.begin(); iter3 != mSensorList.end(); ++iter3)
  		{
! 			if ((*iter3)->internal_dependsOnSolid(s))
  			{
  				(*iter3)->setEnabled(false);
***************
*** 949,953 ****
  		for (iter = mMotorList.begin(); iter != mMotorList.end(); ++iter)
  		{
! 			if ((*iter)->internal_dependsOn(j))
  			{
  				(*iter)->setEnabled(false);
--- 949,953 ----
  		for (iter = mMotorList.begin(); iter != mMotorList.end(); ++iter)
  		{
! 			if ((*iter)->internal_dependsOnJoint(j))
  			{
  				(*iter)->setEnabled(false);

Index: VolumeSensor.h
===================================================================
RCS file: /cvsroot/opal/opal/src/VolumeSensor.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** VolumeSensor.h	21 Mar 2005 03:53:57 -0000	1.4
--- VolumeSensor.h	23 Mar 2005 04:04:31 -0000	1.5
***************
*** 152,156 ****
  		virtual void OPAL_CALL internal_update();
  
! 		virtual bool OPAL_CALL internal_dependsOn(Solid* solid);
  
  	protected:
--- 152,156 ----
  		virtual void OPAL_CALL internal_update();
  
! 		virtual bool OPAL_CALL internal_dependsOnSolid(Solid* s);
  
  	protected:

Index: RaycastSensor.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/RaycastSensor.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** RaycastSensor.cpp	14 Mar 2005 01:20:53 -0000	1.6
--- RaycastSensor.cpp	23 Mar 2005 04:04:30 -0000	1.7
***************
*** 136,142 ****
  	}
  
! 	bool RaycastSensor::internal_dependsOn(Solid* solid)
  	{
! 		if (solid == mData.solid)
  		{
  			return true;
--- 136,142 ----
  	}
  
! 	bool RaycastSensor::internal_dependsOnSolid(Solid* s)
  	{
! 		if (s == mData.solid)
  		{
  			return true;

Index: Joint.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/Joint.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Joint.cpp	21 Mar 2005 04:29:05 -0000	1.27
--- Joint.cpp	23 Mar 2005 04:04:30 -0000	1.28
***************
*** 318,324 ****
  	}
  
! 	bool Joint::internal_dependsOn(Solid* solid)
  	{
! 		if (solid == mData.solid0 || solid == mData.solid1)
  		{
  			return true;
--- 318,324 ----
  	}
  
! 	bool Joint::internal_dependsOnSolid(Solid* s)
  	{
! 		if (s == mData.solid0 || s == mData.solid1)
  		{
  			return true;

Index: VolumeSensor.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/VolumeSensor.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VolumeSensor.cpp	14 Mar 2005 01:20:53 -0000	1.3
--- VolumeSensor.cpp	23 Mar 2005 04:04:31 -0000	1.4
***************
*** 137,143 ****
  	}
  
! 	bool VolumeSensor::internal_dependsOn(Solid* solid)
  	{
! 		if (solid == mData.solid)
  		{
  			return true;
--- 137,143 ----
  	}
  
! 	bool VolumeSensor::internal_dependsOnSolid(Solid* s)
  	{
! 		if (s == mData.solid)
  		{
  			return true;

Index: SpringMotor.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/SpringMotor.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SpringMotor.cpp	9 Mar 2005 02:09:50 -0000	1.9
--- SpringMotor.cpp	23 Mar 2005 04:04:31 -0000	1.10
***************
*** 266,272 ****
  	}
  
! 	bool SpringMotor::internal_dependsOn(Solid* solid)
  	{
! 		if (solid == mData.solid)
  		{
  			return true;
--- 266,272 ----
  	}
  
! 	bool SpringMotor::internal_dependsOnSolid(Solid* s)
  	{
! 		if (s == mData.solid)
  		{
  			return true;

Index: Joint.h
===================================================================
RCS file: /cvsroot/opal/opal/src/Joint.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** Joint.h	21 Mar 2005 04:29:05 -0000	1.65
--- Joint.h	23 Mar 2005 04:04:30 -0000	1.66
***************
*** 223,227 ****
  
  		/// Returns true if this Joint depends on the given Solid.  
! 		virtual bool OPAL_CALL internal_dependsOn(Solid* solid);
  
  	protected:
--- 223,227 ----
  
  		/// Returns true if this Joint depends on the given Solid.  
! 		virtual bool OPAL_CALL internal_dependsOnSolid(Solid* s);
  
  	protected:

Index: AttractorMotor.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/AttractorMotor.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** AttractorMotor.cpp	9 Mar 2005 02:09:49 -0000	1.20
--- AttractorMotor.cpp	23 Mar 2005 04:04:30 -0000	1.21
***************
*** 164,170 ****
  	}
  
! 	bool AttractorMotor::internal_dependsOn(Solid* solid)
  	{
! 		if (solid == mData.solid0 || solid == mData.solid1)
  		{
  			return true;
--- 164,170 ----
  	}
  
! 	bool AttractorMotor::internal_dependsOnSolid(Solid* s)
  	{
! 		if (s == mData.solid0 || s == mData.solid1)
  		{
  			return true;

Index: GearedMotor.h
===================================================================
RCS file: /cvsroot/opal/opal/src/GearedMotor.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** GearedMotor.h	9 Mar 2005 02:09:49 -0000	1.10
--- GearedMotor.h	23 Mar 2005 04:04:30 -0000	1.11
***************
*** 96,100 ****
  		virtual void OPAL_CALL internal_update();
  
! 		virtual bool OPAL_CALL internal_dependsOn(Joint* joint);
  
  	protected:
--- 96,100 ----
  		virtual void OPAL_CALL internal_update();
  
! 		virtual bool OPAL_CALL internal_dependsOnJoint(Joint* j);
  
  	protected:

Index: ServoMotor.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/ServoMotor.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ServoMotor.cpp	9 Mar 2005 02:09:49 -0000	1.14
--- ServoMotor.cpp	23 Mar 2005 04:04:30 -0000	1.15
***************
*** 231,237 ****
  	}
  
! 	bool ServoMotor::internal_dependsOn(Joint* joint)
  	{
! 		if (joint == mData.joint)
  		{
  			return true;
--- 231,237 ----
  	}
  
! 	bool ServoMotor::internal_dependsOnJoint(Joint* j)
  	{
! 		if (j == mData.joint)
  		{
  			return true;