[certi-cvs] certi include/RTI/certiLogicalTimeFactory.h inc...

[CERTI CVS commits]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      11/06/08 14:42:08

Modified files:
        include/RTI    : certiLogicalTimeFactory.h LogicalTimeFactory.h 
                         certiLogicalTimeInterval.h certiLogicalTime.h 
                         Handle.h SpecificConfig.h 
        libRTI         : RTI1516HandleFactory.h 
                         RTI1516HandleImplementation.h RTI1516fedTime.h 
        libHLA         : sha1.h 

Log message:
        Update for proper visibility handling with gcc in 1516 lib.
        Should check on Windows.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/include/RTI/certiLogicalTimeFactory.h?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/certi/include/RTI/LogicalTimeFactory.h?cvsroot=certi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/certi/include/RTI/certiLogicalTimeInterval.h?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/certi/include/RTI/certiLogicalTime.h?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/certi/include/RTI/Handle.h?cvsroot=certi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/certi/include/RTI/SpecificConfig.h?cvsroot=certi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTI1516HandleFactory.h?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTI1516HandleImplementation.h?cvsroot=certi&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTI1516fedTime.h?cvsroot=certi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/certi/libHLA/sha1.h?cvsroot=certi&r1=1.5&r2=1.6

Patches:
Index: include/RTI/certiLogicalTimeFactory.h
===================================================================
RCS file: /sources/certi/certi/include/RTI/certiLogicalTimeFactory.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- include/RTI/certiLogicalTimeFactory.h       28 Apr 2010 18:48:31 -0000      
1.1
+++ include/RTI/certiLogicalTimeFactory.h       8 Jun 2011 14:42:08 -0000       
1.2
@@ -54,7 +54,7 @@
 
 namespace rti1516
 {
-  class RTI_EXPORT_FEDTIME LogicalTimeFactory
+  class FEDTIME_EXPORT LogicalTimeFactory
   {
   public:
     virtual
@@ -77,7 +77,7 @@
 
 namespace rti1516
 {  
-  class RTI_EXPORT_FEDTIME LogicalTimeFactoryFactory
+  class FEDTIME_EXPORT LogicalTimeFactoryFactory
   {
   public:
 

Index: include/RTI/LogicalTimeFactory.h
===================================================================
RCS file: /sources/certi/certi/include/RTI/LogicalTimeFactory.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- include/RTI/LogicalTimeFactory.h    31 May 2010 12:29:44 -0000      1.2
+++ include/RTI/LogicalTimeFactory.h    8 Jun 2011 14:42:08 -0000       1.3
@@ -58,7 +58,7 @@
 
 namespace rti1516
 {  
-  class RTI_EXPORT_FEDTIME LogicalTimeFactoryFactory
+  class FEDTIME_EXPORT LogicalTimeFactoryFactory
   {
   public:
 

Index: include/RTI/certiLogicalTimeInterval.h
===================================================================
RCS file: /sources/certi/certi/include/RTI/certiLogicalTimeInterval.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- include/RTI/certiLogicalTimeInterval.h      28 Apr 2010 18:48:31 -0000      
1.1
+++ include/RTI/certiLogicalTimeInterval.h      8 Jun 2011 14:42:08 -0000       
1.2
@@ -43,7 +43,7 @@
 
 namespace rti1516
 {
-  class RTI_EXPORT_FEDTIME LogicalTimeInterval
+  class FEDTIME_EXPORT LogicalTimeInterval
   {
   public:
     virtual

Index: include/RTI/certiLogicalTime.h
===================================================================
RCS file: /sources/certi/certi/include/RTI/certiLogicalTime.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- include/RTI/certiLogicalTime.h      28 Apr 2010 18:48:31 -0000      1.1
+++ include/RTI/certiLogicalTime.h      8 Jun 2011 14:42:08 -0000       1.2
@@ -44,7 +44,7 @@
 
 namespace rti1516
 {
-  class RTI_EXPORT_FEDTIME LogicalTime
+  class FEDTIME_EXPORT LogicalTime
   {
   public:
     virtual

Index: include/RTI/Handle.h
===================================================================
RCS file: /sources/certi/certi/include/RTI/Handle.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- include/RTI/Handle.h        31 May 2010 12:29:44 -0000      1.2
+++ include/RTI/Handle.h        8 Jun 2011 14:42:08 -0000       1.3
@@ -26,7 +26,7 @@
                                                                 \
 /* Forward declaration for the RTI-internal class            */ \
 /* used to implement a specific kind of handle               */ \
-class HandleKind##Implementation;                               \
+class RTI_EXPORT HandleKind##Implementation;                    \
                                                                 \
 /* Each handle class generated by this macro provides the    */ \
 /* following interface                                       */ \

Index: include/RTI/SpecificConfig.h
===================================================================
RCS file: /sources/certi/certi/include/RTI/SpecificConfig.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- include/RTI/SpecificConfig.h        31 May 2010 12:29:44 -0000      1.4
+++ include/RTI/SpecificConfig.h        8 Jun 2011 14:42:08 -0000       1.5
@@ -26,51 +26,75 @@
 #include <inttypes.h>
 #endif
 
-#if defined(_WIN32)
-#if defined(_MSC_VER) && defined(RTI_DISABLE_WARNINGS)
-// disable warning about truncating template instantiation symbol names
-#pragma warning(disable: 4786)
-// disable warning about exceptions not being part of a method's signature
-#pragma warning(disable: 4290)
-// disable warnings about a "dllexport" class using a regular class
-#pragma warning(disable: 4251)
-#endif
-//
-// On Windows, BUILDING_RTI should be defined only when compiling 
-// the RTI DLL (i.e. by RTI developers).  BUILDING_FEDTIME should 
-// be defined only when building a libfedtime DLL.  STATIC_RTI
-// should be defined when building a static (non-DLL) RTI library,
-// or when building a federate that wants to statically link to
-// an RTI library.  STATIC_FEDTIME should be defined when building 
-// a static (non-DLL) fedtime library, or when building a federate 
-// that wants to statically link to a fedtime library.
-//
-#if defined(STATIC_RTI)
-#define RTI_EXPORT
+// DLL visibility macros helpers
+#if defined(_WIN32) || defined(__CYGWIN__)
+    #define ANY_DLL_EXPORT __declspec(dllexport)
+    #define ANY_DLL_IMPORT __declspec(dllimport)
+    #define ANY_DLL_LOCAL
 #else
-#if defined(BUILDING_RTI)
-// define the proper qualifiers to import/export symbols from/to DLL
-#define RTI_EXPORT __declspec(dllexport)
-#else // !BUILDING_RTI
-#define RTI_EXPORT __declspec(dllimport)
-#endif // BUILDING_RTI
-#endif // STATIC_RTI
+    #if (__GNUC__ >= 4)
+       #define ANY_DLL_EXPORT __attribute__ ((visibility("default")))
+       #define ANY_DLL_IMPORT __attribute__ ((visibility("default")))
+       #define ANY_DLL_LOCAL  __attribute__ ((visibility("hidden")))
+    #else
+       #define ANY_DLL_EXPORT
+       #define ANY_DLL_IMPORT
+       #define ANY_DLL_LOCAL
+    #endif
+#endif
 
-#if defined(STATIC_FEDTIME)
-#define RTI_EXPORT_FEDTIME
-#else
-#if defined(BUILDING_FEDTIME)
-// define the proper qualifiers to import/export symbols from/to DLL
-#define RTI_EXPORT_FEDTIME __declspec(dllexport)
-#else // !BUILDING_FEDTIME
-#define RTI_EXPORT_FEDTIME __declspec(dllimport)
-#endif // BUILDING_FEDTIME
-#endif // STATIC_FEDTIME
+#if defined(_WIN32)
+    #if defined(_MSC_VER) && defined(RTI_DISABLE_WARNINGS)
+    // disable warning about truncating template instantiation symbol names
+    #pragma warning(disable: 4786)
+    // disable warning about exceptions not being part of a method's signature
+    #pragma warning(disable: 4290)
+    // disable warnings about a "dllexport" class using a regular class
+    #pragma warning(disable: 4251)
+    #endif
+   //
+   // On Windows, BUILDING_RTI should be defined only when compiling
+   // the RTI DLL (i.e. by RTI developers).  BUILDING_FEDTIME should
+   // be defined only when building a libfedtime DLL.  STATIC_RTI
+   // should be defined when building a static (non-DLL) RTI library,
+   // or when building a federate that wants to statically link to
+   // an RTI library.  STATIC_FEDTIME should be defined when building
+   // a static (non-DLL) fedtime library, or when building a federate
+   // that wants to statically link to a fedtime library.
+   //
+   #if defined(STATIC_RTI)
+       #define RTI_EXPORT
+   #else
+       #if defined(BUILDING_RTI)
+          // define the proper qualifiers to import/export symbols from/to DLL
+          #define RTI_EXPORT __declspec(dllexport)
+       #else // !BUILDING_RTI
+          #define RTI_EXPORT __declspec(dllimport)
+       #endif // BUILDING_RTI
+   #endif // STATIC_RTI
 
+   #if defined(STATIC_FEDTIME)
+       #define FEDTIME_EXPORT
+   #else
+       #if defined(BUILDING_FEDTIME)
+           // define the proper qualifiers to import/export symbols from/to DLL
+           #define FEDTIME_EXPORT __declspec(dllexport)
+       #else // !BUILDING_FEDTIME
+           #define FEDTIME_EXPORT __declspec(dllimport)
+       #endif // BUILDING_FEDTIME
+   #endif // STATIC_FEDTIME
 #else // !_WIN32
 // no special qualfifers are necessary on non-WIN32 platforms
-#define RTI_EXPORT
-#define RTI_EXPORT_FEDTIME
+   #if defined(RTI_EXPORTS)
+       #define RTI_EXPORT ANY_DLL_EXPORT
+   #else
+       #define RTI_EXPORT ANY_DLL_IMPORT
+   #endif
+   #if defined(FedTime_EXPORTS)
+       #define FEDTIME_EXPORT ANY_DLL_EXPORT
+   #else
+       #define FEDTIME_EXPORT ANY_DLL_IMPORT
+   #endif
 #endif
 
 #endif // RTI_SpecificConfig_h

Index: libRTI/RTI1516HandleFactory.h
===================================================================
RCS file: /sources/certi/certi/libRTI/RTI1516HandleFactory.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libRTI/RTI1516HandleFactory.h       28 Apr 2010 18:48:30 -0000      1.1
+++ libRTI/RTI1516HandleFactory.h       8 Jun 2011 14:42:08 -0000       1.2
@@ -49,7 +49,7 @@
                                                                                
                                                \
 /* Each handle class generated by this macro provides the    */ \
 /* following interface                                       */ \
-class HandleKind##Friend                                        \
+class RTI_EXPORT HandleKind##Friend                                        \
 {                                                               \
 public:                                                         \
    static HandleKind createRTI1516Handle(const certi::Handle & certiHandle);   
                \

Index: libRTI/RTI1516HandleImplementation.h
===================================================================
RCS file: /sources/certi/certi/libRTI/RTI1516HandleImplementation.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libRTI/RTI1516HandleImplementation.h        4 Jun 2010 21:01:42 -0000       
1.3
+++ libRTI/RTI1516HandleImplementation.h        8 Jun 2011 14:42:08 -0000       
1.4
@@ -22,7 +22,7 @@
 
 namespace rti1516
 {
-       class HandleImplementation                                     
+       class RTI_EXPORT HandleImplementation
        {    
        protected:
           /* Constructs an invalid handle                           */ 
@@ -67,7 +67,7 @@
                                                                 \
 /* Each handle class generated by this macro provides the    */ \
 /* following interface                                       */ \
-class HandleKind##Implementation : public HandleImplementation  \
+class RTI_EXPORT HandleKind##Implementation : public HandleImplementation  \
 {                                                               \
 public:                                                         \
                                                                 \

Index: libRTI/RTI1516fedTime.h
===================================================================
RCS file: /sources/certi/certi/libRTI/RTI1516fedTime.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libRTI/RTI1516fedTime.h     31 May 2010 09:33:25 -0000      1.2
+++ libRTI/RTI1516fedTime.h     8 Jun 2011 14:42:08 -0000       1.3
@@ -9,7 +9,7 @@
        class VariableLengthData;
 }
 
-class RTI_EXPORT_FEDTIME RTI1516fedTime : public rti1516::LogicalTime
+class FEDTIME_EXPORT RTI1516fedTime : public rti1516::LogicalTime
 {
 public:
        RTI1516fedTime(double timeVal);
@@ -136,7 +136,7 @@
 
 }; // class RTI_EXPORT_FEDTIME RTI1516fedTime
 
-class RTI_EXPORT_FEDTIME RTI1516fedTimeInterval : public 
rti1516::LogicalTimeInterval
+class FEDTIME_EXPORT RTI1516fedTimeInterval : public 
rti1516::LogicalTimeInterval
 {
 public:
        RTI1516fedTimeInterval(double timeVal);
@@ -266,9 +266,9 @@
        double _epsilon;
        double _positiveInfinity;
 
-}; // class RTI_EXPORT_FEDTIME RTI1516fedTimeInterval
+}; // class FEDTIME_EXPORT RTI1516fedTimeInterval
 
-class RTI_EXPORT_FEDTIME RTI1516fedTimeFactory : public 
rti1516::LogicalTimeFactory
+class FEDTIME_EXPORT RTI1516fedTimeFactory : public rti1516::LogicalTimeFactory
 {
 public:
        virtual
@@ -304,7 +304,7 @@
        RTI1516fedTimeFactory()
                throw();
 
-}; // class RTI_EXPORT_FEDTIME RTI1516fedTimeFactory
+}; // class FEDTIME_EXPORT RTI1516fedTimeFactory
 
 
 
@@ -314,7 +314,7 @@
 
 //namespace rti1516
 //{  
-//  class RTI_EXPORT_FEDTIME LogicalTimeFactoryFactory
+//  class FEDTIME_EXPORT LogicalTimeFactoryFactory
 //  {
 //  public:
 //

Index: libHLA/sha1.h
===================================================================
RCS file: /sources/certi/certi/libHLA/sha1.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libHLA/sha1.h       26 Apr 2011 11:07:38 -0000      1.5
+++ libHLA/sha1.h       8 Jun 2011 14:42:08 -0000       1.6
@@ -96,7 +96,7 @@
  *  This structure will hold context information for the SHA-1
  *  hashing operation
  */
-typedef struct HLA_EXPORT SHA1Context
+typedef struct SHA1Context
 {
     uint32_t Intermediate_Hash[SHA1HashSize/4]; /* Message Digest  */