[certi-cvs] certi libCERTI/NameReservation.hh libRTI/CMakeL...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      10/05/31 13:14:18

Modified files:
        libCERTI       : NameReservation.hh 
        libRTI         : CMakeLists.txt LogicalTimeDouble.cpp 
                         RTI1516fedTime.cpp 

Log message:
        Fix WIndows MinGW build after Jeroen Merge

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NameReservation.hh?cvsroot=certi&r1=3.1&r2=3.2
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/CMakeLists.txt?cvsroot=certi&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/LogicalTimeDouble.cpp?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTI1516fedTime.cpp?cvsroot=certi&r1=1.2&r2=1.3

Patches:
Index: libCERTI/NameReservation.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NameReservation.hh,v
retrieving revision 3.1
retrieving revision 3.2
diff -u -b -r3.1 -r3.2
--- libCERTI/NameReservation.hh 31 May 2010 09:33:26 -0000      3.1
+++ libCERTI/NameReservation.hh 31 May 2010 13:14:18 -0000      3.2
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: NameReservation.hh,v 3.1 2010/05/31 09:33:26 erk Exp $
+// $Id: NameReservation.hh,v 3.2 2010/05/31 13:14:18 erk Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef LIBCERTI_NAME_RESERVATION_HH
@@ -52,5 +52,4 @@
 };
 
 } // namespace certi
-
 #endif // LIBCERTI_NAME_RESERVATION_HH
\ No newline at end of file

Index: libRTI/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/libRTI/CMakeLists.txt,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- libRTI/CMakeLists.txt       31 May 2010 11:58:27 -0000      1.16
+++ libRTI/CMakeLists.txt       31 May 2010 13:14:18 -0000      1.17
@@ -144,9 +144,14 @@
     ../include/RTI/certiLogicalTimeFactory.h
     RTI1516fedTime.h
     RTI1516fedTime.cpp
+
+)
+IF (BUILD_WITH_EXTRA_LOGICAL_TIME)
+   LIST(APPEND FEDTIME1516_SRC
     LogicalTimeDouble.h
     LogicalTimeDouble.cpp
-)
+        )
+ENDIF(BUILD_WITH_EXTRA_LOGICAL_TIME)
 
 SOURCE_GROUP("Source Files\\FedTime" FILES ${FEDTIME1516_SRCS})
 
@@ -155,7 +160,7 @@
 )
 
 # Correct line
-#TARGET_LINK_LIBRARIES(FedTime1516)
+TARGET_LINK_LIBRARIES(FedTime1516)
 # Incorrect line
 #TARGET_LINK_LIBRARIES(FedTime1516 RTI1516)
 

Index: libRTI/LogicalTimeDouble.cpp
===================================================================
RCS file: /sources/certi/certi/libRTI/LogicalTimeDouble.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libRTI/LogicalTimeDouble.cpp        31 May 2010 11:58:27 -0000      1.1
+++ libRTI/LogicalTimeDouble.cpp        31 May 2010 13:14:18 -0000      1.2
@@ -117,7 +117,8 @@
                _value = p._value;
        } catch (std::bad_cast)
        {
-               throw rti1516::InvalidLogicalTime(L"Invalid LogicalTimeDouble");
+           throw std::wstring(L"Invalid LogicalTimeDouble");
+               //throw rti1516::InvalidLogicalTime(L"Invalid 
LogicalTimeDouble");
        }
 }
 
@@ -149,7 +150,8 @@
                _value += p._value;
        } catch (std::bad_cast)
        {
-               throw rti1516::InvalidLogicalTimeInterval(L"Invalid 
LogicalTimeDouble");
+           throw std::wstring(L"Invalid LogicalTimeDouble");
+               //throw rti1516::InvalidLogicalTimeInterval(L"Invalid 
LogicalTimeDouble");
        }
 }
 
@@ -161,7 +163,8 @@
                _value -= p._value;
        } catch (std::bad_cast)
        {
-               throw rti1516::InvalidLogicalTimeInterval(L"Invalid 
LogicalTimeDouble");
+           throw std::wstring(L"Invalid LogicalTimeDouble");
+               //throw rti1516::InvalidLogicalTimeInterval(L"Invalid 
LogicalTimeDouble");
        }
 
 }
@@ -174,7 +177,8 @@
                return std::auto_ptr< rti1516::LogicalTimeInterval >(new 
LogicalTimeIntervalDouble(_value - p._value));
        } catch (std::bad_cast)
        {
-               throw rti1516::InvalidLogicalTime(L"Invalid LogicalTimeDouble");
+           throw std::wstring(L"Invalid LogicalTimeDouble");
+               //throw rti1516::InvalidLogicalTime(L"Invalid 
LogicalTimeDouble");
        }
 }
 
@@ -186,7 +190,8 @@
                return _value > p._value;
        } catch (std::bad_cast)
        {
-               throw rti1516::InvalidLogicalTime(L"Invalid LogicalTimeDouble");
+           throw std::wstring(L"Invalid LogicalTimeDouble");
+               //throw rti1516::InvalidLogicalTime(L"Invalid 
LogicalTimeDouble");
        }
 }
 
@@ -198,7 +203,8 @@
                return _value < p._value;
        } catch (std::bad_cast)
        {
-               throw rti1516::InvalidLogicalTime(L"Invalid LogicalTimeDouble");
+           throw std::wstring(L"Invalid LogicalTimeDouble");
+               //throw rti1516::InvalidLogicalTime(L"Invalid 
LogicalTimeDouble");
        }
 }
 
@@ -210,7 +216,8 @@
                return _value == p._value;
        } catch (std::bad_cast)
        {
-               throw rti1516::InvalidLogicalTime(L"Invalid LogicalTimeDouble");
+           throw std::wstring(L"Invalid LogicalTimeDouble");
+               //throw rti1516::InvalidLogicalTime(L"Invalid 
LogicalTimeDouble");
        }
 }
 
@@ -222,7 +229,8 @@
                return _value >= p._value;
        } catch (std::bad_cast)
        {
-               throw rti1516::InvalidLogicalTime(L"Invalid LogicalTimeDouble");
+           throw std::wstring(L"Invalid LogicalTimeDouble");
+               //throw rti1516::InvalidLogicalTime(L"Invalid 
LogicalTimeDouble");
        }
 }
 
@@ -234,7 +242,8 @@
                return _value <= p._value;
        } catch (std::bad_cast)
        {
-               throw rti1516::InvalidLogicalTime(L"Invalid LogicalTimeDouble");
+           throw std::wstring(L"Invalid LogicalTimeDouble");
+               //throw rti1516::InvalidLogicalTime(L"Invalid 
LogicalTimeDouble");
        }
 }
 
@@ -267,7 +276,8 @@
                return (((left._value - 1000) < _value) && ((left._value + 
1000) > _value));
        } catch (std::bad_cast)
        {
-               throw rti1516::InvalidLogicalTime(L"Invalid LogicalTimeDouble");
+           throw std::wstring(L"Invalid LogicalTimeDouble");
+               //throw rti1516::InvalidLogicalTime(L"Invalid 
LogicalTimeDouble");
        }
 }
 

Index: libRTI/RTI1516fedTime.cpp
===================================================================
RCS file: /sources/certi/certi/libRTI/RTI1516fedTime.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libRTI/RTI1516fedTime.cpp   31 May 2010 09:33:25 -0000      1.2
+++ libRTI/RTI1516fedTime.cpp   31 May 2010 13:14:18 -0000      1.3
@@ -15,14 +15,16 @@
 rti1516::LogicalTime::operator=(rti1516::LogicalTime const & value)
 throw (rti1516::InvalidLogicalTime)
 {
-       throw rti1516::InvalidLogicalTime(L"Operator should be overloaded");
+    throw std::wstring(L"Operator should be overloaded");
+       //throw rti1516::InvalidLogicalTime(L"Operator should be overloaded");
 }
 
 rti1516::LogicalTimeInterval &
 rti1516::LogicalTimeInterval::operator=(rti1516::LogicalTimeInterval const & 
value)
 throw (rti1516::InvalidLogicalTimeInterval)
 {
-       throw rti1516::InvalidLogicalTimeInterval(L"Operator should be 
overloaded");
+    throw std::wstring(L"Operator should be overloaded");
+       //throw rti1516::InvalidLogicalTimeInterval(L"Operator should be 
overloaded");
 }
 
 
@@ -96,9 +98,9 @@
                const RTI1516fedTime * other = dynamic_cast<const 
RTI1516fedTime *>(&value);
                if (other == 0)
                {
-#if defined(_WIN32) && defined(_MSC_VER)
-                       //throw std::wstring(L"Different LogicalTime 
implementation");'
-                       throw rti1516::InvalidLogicalTime(L"Different 
LogicalTime implementation");
+#if defined(_WIN32)
+                       throw std::wstring(L"Different LogicalTime 
implementation");
+                       //throw rti1516::InvalidLogicalTime(L"Different 
LogicalTime implementation");
 #else
                        //throw rti1516::InvalidLogicalTime(L"Different 
LogicalTime implementation");
 #endif
@@ -136,7 +138,7 @@
        const RTI1516fedTime * other = dynamic_cast<const RTI1516fedTime 
*>(&value);
        if (other == 0)
        {
-#if defined(_WIN32) && defined(_MSC_VER)
+#if defined(_WIN32)
                throw std::wstring(L"Different LogicalTime implementation");
 #else
                //throw rti1516::InvalidLogicalTime(L"Different LogicalTime 
implementation");
@@ -157,7 +159,7 @@
        const RTI1516fedTime * other = dynamic_cast<const RTI1516fedTime 
*>(&value);
        if (other == 0)
        {
-#if defined(_WIN32) && defined(_MSC_VER)
+#if defined(_WIN32)
                throw std::wstring(L"Different LogicalTime implementation");
 #else
                //throw rti1516::InvalidLogicalTime(L"Different LogicalTime 
implementation");
@@ -178,7 +180,7 @@
        const RTI1516fedTime * other = dynamic_cast<const RTI1516fedTime 
*>(&value);
        if (other == 0)
        {
-#if defined(_WIN32) && defined(_MSC_VER)
+#if defined(_WIN32)
                throw std::wstring(L"Different LogicalTime implementation");
 #else
                //throw rti1516::InvalidLogicalTime(L"Different LogicalTime 
implementation");
@@ -197,7 +199,7 @@
        const RTI1516fedTime * other = dynamic_cast<const RTI1516fedTime 
*>(&value);
        if (other == 0)
        {
-#if defined(_WIN32) && defined(_MSC_VER)
+#if defined(_WIN32)
                throw std::wstring(L"Different LogicalTime implementation");
 #else
                //throw rti1516::InvalidLogicalTime(L"Different LogicalTime 
implementation");
@@ -216,7 +218,7 @@
        const RTI1516fedTime * other = dynamic_cast<const RTI1516fedTime 
*>(&value);
        if (other == 0)
        {
-#if defined(_WIN32) && defined(_MSC_VER)
+#if defined(_WIN32)
                throw std::wstring(L"Different LogicalTime implementation");
 #else
                //throw rti1516::InvalidLogicalTime(L"Different LogicalTime 
implementation");
@@ -236,7 +238,7 @@
        const RTI1516fedTime * other = dynamic_cast<const RTI1516fedTime 
*>(&value);
        if (other == 0)
        {
-#if defined(_WIN32) && defined(_MSC_VER)
+#if defined(_WIN32)
                throw std::wstring(L"Different LogicalTime implementation");
 #else
                //throw rti1516::InvalidLogicalTime(L"Different LogicalTime 
implementation");
@@ -255,7 +257,7 @@
        const RTI1516fedTime * other = dynamic_cast<const RTI1516fedTime 
*>(&value);
        if (other == 0)
        {
-#if defined(_WIN32) && defined(_MSC_VER)
+#if defined(_WIN32)
                throw std::wstring(L"Different LogicalTime implementation");
 #else
                //throw rti1516::InvalidLogicalTime(L"Different LogicalTime 
implementation");
@@ -300,7 +302,7 @@
                return sizeof(double);
        } else
        {
-#if defined(_WIN32) && defined(_MSC_VER)
+#if defined(_WIN32)
                throw std::wstring(L"Not enough space in buffer to encode 
RTI1516fedTime");
 #else
                //throw rti1516::CouldNotEncode(L"Not enough space in buffer to 
encode RTI1516fedTime");