Fix various exports for win32.

phamelin · Feb 4, 2011 · 1c8425e · 1c8425e
1 parent e1c1116
commit 1c8425e
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/rtt/scripting/CommonParser.hpp b/rtt/scripting/CommonParser.hpp
@@ -49,7 +49,7 @@ namespace RTT { namespace scripting
    * a keyword is wrongly used as an identifier. In current implementation
    * it almost never throws.
    */
-  class RTT_API CommonParser
+  class RTT_SCRIPTING_API CommonParser
   {
       std::string lastparsedident;
   public:

diff --git a/rtt/scripting/parser-types.hpp b/rtt/scripting/parser-types.hpp
@@ -79,7 +79,7 @@ namespace RTT
      * Parser used in skip parser. Set skipeol to 'true' to
      * skip newlines, set skipeol to false to not skip newlines.
      */
-    struct RTT_API eol_skip_functor
+    struct RTT_SCRIPTING_API eol_skip_functor
     {
     private:
         eol_skip_functor();

diff --git a/rtt/transports/corba/CorbaConnPolicy.hpp b/rtt/transports/corba/CorbaConnPolicy.hpp
@@ -46,13 +46,13 @@
  * @param policy RTT policy
  * @return Corba policy
  */
-RTT::corba::CConnPolicy toCORBA(RTT::ConnPolicy const& policy);
+RTT_CORBA_API RTT::corba::CConnPolicy toCORBA(RTT::ConnPolicy const& policy);
 
 /**
  * Converts a Corba CConnPolicy object to a RTT ConPolicy object.
  * Policy objects are used to setup data flow connections.
  * @param policy Corba policy
  * @return RTT policy
  */
-RTT::ConnPolicy toRTT(RTT::corba::CConnPolicy const& corba_policy);
+RTT_CORBA_API RTT::ConnPolicy toRTT(RTT::corba::CConnPolicy const& corba_policy);
 
diff --git a/rtt/transports/corba/CorbaDispatcher.hpp b/rtt/transports/corba/CorbaDispatcher.hpp
@@ -66,8 +66,8 @@ namespace RTT {
 
             RTT_CORBA_API static os::Mutex* mlock;
 
-            static int defaultScheduler;
-            static int defaultPriority;
+            RTT_CORBA_API static int defaultScheduler;
+            RTT_CORBA_API static int defaultPriority;
 
             CorbaDispatcher( const std::string& name)
             : Activity(defaultScheduler, defaultPriority, 0.0, 0, name),

diff --git a/rtt/transports/corba/DataFlowI.h b/rtt/transports/corba/DataFlowI.h
@@ -108,7 +108,7 @@ namespace RTT {
          * If the ConnPolicy says so, this interface can also build
          * connections using other transports.
          */
-        class CDataFlowInterface_i
+        class RTT_CORBA_API CDataFlowInterface_i
             : public virtual POA_RTT::corba::CDataFlowInterface
         {
             DataFlowInterface* mdf;

diff --git a/rtt/transports/corba/RTTCorbaConversion.hpp b/rtt/transports/corba/RTTCorbaConversion.hpp
@@ -51,22 +51,22 @@ namespace RTT
 { namespace corba {
 
     template<>
-    struct RTT_CORBA_API AnyConversion<double> : public AnyConversionHelper<double> {};
+    struct AnyConversion<double> : public AnyConversionHelper<double> {};
 
     template<>
-    struct RTT_CORBA_API AnyConversion<float> : public AnyConversionHelper<float> {};
+    struct AnyConversion<float> : public AnyConversionHelper<float> {};
 
     template<>
-    struct RTT_CORBA_API AnyConversion<int> : public AnyConversionHelper<int, CORBA::Long> {};
+    struct AnyConversion<int> : public AnyConversionHelper<int, CORBA::Long> {};
 
     //template<>
-    //struct RTT_CORBA_API AnyConversion<long> : public AnyConversionHelper<long> {};
+    //struct AnyConversion<long> : public AnyConversionHelper<long> {};
 
     template<>
-    struct RTT_CORBA_API AnyConversion<unsigned int> : public AnyConversionHelper<unsigned int, CORBA::ULong> {};
+    struct AnyConversion<unsigned int> : public AnyConversionHelper<unsigned int, CORBA::ULong> {};
 
     template<>
-    struct RTT_CORBA_API AnyConversion<CORBA::Any_ptr>
+    struct AnyConversion<CORBA::Any_ptr>
     {
         typedef CORBA::Any_ptr CorbaType;
         typedef CORBA::Any_ptr StdType;
@@ -90,7 +90,7 @@ namespace RTT
     };
 
     template<>
-    struct RTT_CORBA_API AnyConversion<CORBA::Any_var>
+    struct AnyConversion<CORBA::Any_var>
     {
         typedef CORBA::Any_ptr CorbaType;
         typedef CORBA::Any_var StdType;
@@ -114,7 +114,7 @@ namespace RTT
     };
 
     template<>
-    struct RTT_CORBA_API AnyConversion<bool>
+    struct AnyConversion<bool>
     {
         typedef CORBA::Boolean CorbaType;
         typedef bool StdType;
@@ -151,7 +151,7 @@ namespace RTT
     };
 
     template<>
-    struct RTT_CORBA_API AnyConversion<char>
+    struct AnyConversion<char>
     {
         typedef CORBA::Char CorbaType;
         typedef char StdType;
@@ -187,7 +187,7 @@ namespace RTT
     };
 
     template<>
-    struct RTT_CORBA_API AnyConversion<std::string>
+    struct AnyConversion<std::string>
     {
         typedef const char* CorbaType;
         typedef std::string StdType;
@@ -227,7 +227,7 @@ namespace RTT
      * for converting between RTT::ConnPolicy and RTT::corba::CConPolicy.
      */
     template<>
-    struct RTT_CORBA_API AnyConversion<ConnPolicy>
+    struct AnyConversion<ConnPolicy>
     {
         typedef RTT::corba::CConnPolicy CorbaType;
         typedef RTT::ConnPolicy StdType;
@@ -263,7 +263,7 @@ namespace RTT
     };
 
     template<>
-    struct RTT_CORBA_API AnyConversion<RTT::TaskContext*>
+    struct AnyConversion<RTT::TaskContext*>
     {
         typedef RTT::corba::CTaskContext_ptr CorbaType;
         typedef RTT::TaskContext* StdType;
@@ -298,7 +298,7 @@ namespace RTT
 
 
     template<>
-    struct RTT_CORBA_API AnyConversion< std::vector<double> >
+    struct AnyConversion< std::vector<double> >
     {
         typedef corba::CDoubleSequence CorbaType;
         typedef std::vector<double> StdType;