opal-commits

[Olex <ole...@us...>]

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

Modified Files:
	Portability.h VelocityMotor.h testBlueprint.cpp 
Log Message:
Fixes for Windows linking.

Index: testBlueprint.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/testBlueprint.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** testBlueprint.cpp	10 Dec 2005 05:18:35 -0000	1.1
--- testBlueprint.cpp	11 Dec 2005 04:43:05 -0000	1.2
***************
*** 77,81 ****
              MockCollisionHandler() {}
  
!             void handleCollisionEvent( const CollisionEvent & e )
              {
                  // nothing
--- 77,81 ----
              MockCollisionHandler() {}
  
!             void OPAL_CALL handleCollisionEvent( const CollisionEvent & e )
              {
                  // nothing

Index: VelocityMotor.h
===================================================================
RCS file: /cvsroot/opal/opal/src/VelocityMotor.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VelocityMotor.h	10 Dec 2005 05:32:48 -0000	1.2
--- VelocityMotor.h	11 Dec 2005 04:43:05 -0000	1.3
***************
*** 57,92 ****
  
              //! destructor
!             ~VelocityMotor();
  
              /// Initializes the Motor with the given data structure.
!             void OPAL_CALL init( const VelocityMotorData & data );
  
              /// Sets whether the Motor has any effect.
!             void OPAL_CALL setEnabled( bool e );
  
              /// Returns true if the Motor is enabled.
!             bool OPAL_CALL isEnabled() const;
  
              /// Returns the Motor type.
!             MotorType OPAL_CALL getType() const;
  
              /// Sets the Motor's name.
!             void OPAL_CALL setName( const std::string & name );
  
              /// Returns the Motor's name.
!             const std::string & OPAL_CALL getName() const;
  
              /// Set target velocity.
!             void OPAL_CALL setVelocity( const Vec3r & velocity );
  
              /// Return target velocity.
!             const Vec3r & OPAL_CALL getVelocity() const;
  
              /// Called regularly to update the Motor.  This does nothing if the
              /// Motor is disabled.
!             void OPAL_CALL internal_update();
  
              //! Returns true if motors controls this solid.
!             bool OPAL_CALL internal_dependsOnSolid( Solid * s ) const;
  
              //! against gravity or not?
--- 57,92 ----
  
              //! destructor
!             virtual ~VelocityMotor();
  
              /// Initializes the Motor with the given data structure.
!             virtual void OPAL_CALL init( const VelocityMotorData & data );
  
              /// Sets whether the Motor has any effect.
!             virtual void OPAL_CALL setEnabled( bool e );
  
              /// Returns true if the Motor is enabled.
!             virtual bool OPAL_CALL isEnabled() const;
  
              /// Returns the Motor type.
!             virtual MotorType OPAL_CALL getType() const;
  
              /// Sets the Motor's name.
!             virtual void OPAL_CALL setName( const std::string & name );
  
              /// Returns the Motor's name.
!             virtual const std::string & OPAL_CALL getName() const;
  
              /// Set target velocity.
!             virtual void OPAL_CALL setVelocity( const Vec3r & velocity );
  
              /// Return target velocity.
!             virtual const Vec3r & OPAL_CALL getVelocity() const;
  
              /// Called regularly to update the Motor.  This does nothing if the
              /// Motor is disabled.
!             virtual void OPAL_CALL internal_update();
  
              //! Returns true if motors controls this solid.
!             virtual bool OPAL_CALL internal_dependsOnSolid( Solid * s ) const;
  
              //! against gravity or not?
***************
*** 95,108 ****
               *               so solid will be affected by gravity
               */
!             void OPAL_CALL letGravityAffectSolid( bool affect );
  
              //! Returns true if gravity is being ignored by the motor
!             bool OPAL_CALL doesGravityAffectSolid() const;
  
              //! Maximum allowed force for the motor to use.
!             void OPAL_CALL setMaximumForce( real maxForce );
  
              //! What is the maximum allowed force for this motor?
!             real OPAL_CALL getMaximumForce() const;
  
          protected:
--- 95,108 ----
               *               so solid will be affected by gravity
               */
!             virtual void OPAL_CALL letGravityAffectSolid( bool affect );
  
              //! Returns true if gravity is being ignored by the motor
!             virtual bool OPAL_CALL doesGravityAffectSolid() const;
  
              //! Maximum allowed force for the motor to use.
!             virtual void OPAL_CALL setMaximumForce( real maxForce );
  
              //! What is the maximum allowed force for this motor?
!             virtual real OPAL_CALL getMaximumForce() const;
  
          protected:

Index: Portability.h
===================================================================
RCS file: /cvsroot/opal/opal/src/Portability.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Portability.h	24 Jun 2005 17:50:48 -0000	1.9
--- Portability.h	11 Dec 2005 04:43:05 -0000	1.10
***************
*** 40,53 ****
  // DLL import/export macro.
  #ifndef OPAL_DECL
! 	#if defined(WIN32) || defined(_WIN32)
! 		#ifdef OPAL_DLL_EXPORTING
! 			#define OPAL_DECL __declspec(dllexport)
! 		#else
! 			#define OPAL_DECL __declspec(dllimport)
! 		#endif
! 	#else
! 		#define OPAL_DECL
! 	#endif
! #endif
  
  /// Macro for exporting functions that keeps function names from being 
--- 40,57 ----
  // DLL import/export macro.
  #ifndef OPAL_DECL
!    #if (defined(WIN32) || defined(_WIN32))
!       #ifdef OPAL_DLL_EXPORTING
!          #define OPAL_DECL __declspec(dllexport)
!       #else
!             #if !defined(__MINGW32__) && !defined(__CYGWIN__)
!                 #define OPAL_DECL  __declspec(dllimport)
!             #else
!                 #define OPAL_DECL
!             #endif
!       #endif
!    #else
!       #define OPAL_DECL
!    #endif
! #endif 
  
  /// Macro for exporting functions that keeps function names from being