MSVC patch

diff --git a/orte/include/orte_headers.h b/orte/include/orte_headers.h
index 50d1a756746f3547aa5cf257857d55d6425488af..f130970875b5e742e97f5a00b1bd034e91f28c4b 100644 (file)
--- a/orte/include/orte_headers.h
+++ b/orte/include/orte_headers.h
@@ -25,10 +25,10 @@
 extern "C" {
 #endif
 
-#if defined(HAVE_CONFIG_H) || defined(OMK_FOR_USER)  || defined(OMK_FOR_KERNEL)
-  #include "orte/orte_config.h"
-#elif defined _MSC_VER
+#if defined _MSC_VER
   #include "orte/ew_types.h"
+#elif defined(HAVE_CONFIG_H) || defined(OMK_FOR_USER)  || defined(OMK_FOR_KERNEL)
+  #include "orte/orte_config.h"
 #else
   #error ""
   #error "You don't have file 'orte/orte_config.h'."

diff --git a/orte/include/rtps_endian.h b/orte/include/rtps_endian.h
index ec9595054abe08772c0905498af7196671016d59..fe46399abb37ab0f2f4ef8ed0556e07ada652933 100644 (file)
--- a/orte/include/rtps_endian.h
+++ b/orte/include/rtps_endian.h
@@ -1,8 +1,6 @@
 #ifndef RTPS_ENDIAN_H
 #define RTPS_ENDIAN_H 1
 
-#include "orte/orte_config.h"
-
 #define FLAG_BIG_ENDIAN 0
 #define FLAG_LITTLE_ENDIAN 1
 

diff --git a/orte/liborte/ORTEAppSendThread.c b/orte/liborte/ORTEAppSendThread.c
index eb49292e677a70a771e93b1da8a231a34b4b4f8d..342904a52a5b5dfaf3b2b5b2ce5f3c5b693c26f1 100644 (file)
--- a/orte/liborte/ORTEAppSendThread.c
+++ b/orte/liborte/ORTEAppSendThread.c
@@ -37,7 +37,7 @@ void ORTESendData(ORTEDomain *d,ObjectEntryAID *objectEntryAID,Boolean meta) {
       for(i=0;i<appParams->metatrafficMulticastIPAddressCount;i++) {
         des.sin_family=AF_INET; 
         des.sin_addr.s_addr = htonl(appParams->metatrafficMulticastIPAddressList[i]);
-        des.sin_port = htons(object->multicastPort); 
+        des.sin_port = htons((uint16_t)object->multicastPort); 
         if (d->taskSend.mb.cdrCodecDirect) {
           sock_sendto (&d->taskSend.sock,
                        d->taskSend.mb.cdrCodecDirect->buffer,
@@ -61,7 +61,7 @@ void ORTESendData(ORTEDomain *d,ObjectEntryAID *objectEntryAID,Boolean meta) {
         } else {
           port=appParams->userdataUnicastPort; 
         }
-        des.sin_port = htons(port); 
+        des.sin_port = htons((uint16_t)port); 
         if (d->taskSend.mb.cdrCodecDirect) {
           sock_sendto (&d->taskSend.sock,
                        d->taskSend.mb.cdrCodecDirect->buffer,

diff --git a/orte/liborte/ORTEDomain.c b/orte/liborte/ORTEDomain.c
index 26206db9e080a8e71977c43415a09a305da576c2..ea8c75bac6e003a621a6502c1a11f3feb02a67b8 100644 (file)
--- a/orte/liborte/ORTEDomain.c
+++ b/orte/liborte/ORTEDomain.c
@@ -321,7 +321,7 @@ ORTEDomainCreate(int domain, ORTEDomainProp *prop,
 
     /* receiving multicast port (metatraffic) */
     Domain2PortMulticastMetatraffic(d->domain,mport);
-    sock_bind(&d->taskRecvMulticastMetatraffic.sock,mport); 
+    sock_bind(&d->taskRecvMulticastMetatraffic.sock,(uint16_t)mport); 
     debug(30,2) ("ORTEDomainCreate: bind on port(RecvMulticastMetatraffic): %u\n",
                   d->taskRecvMulticastMetatraffic.sock.port);
   }
@@ -353,7 +353,7 @@ ORTEDomainCreate(int domain, ORTEDomainProp *prop,
       
       /* receiving multicast port (userdata) */
       Domain2PortMulticastUserdata(d->domain,mport);
-      sock_bind(&d->taskRecvMulticastUserdata.sock,mport); 
+      sock_bind(&d->taskRecvMulticastUserdata.sock,(uint16_t)mport); 
       debug(30,2) ("ORTEDomainCreate: bind on port(RecvMulticastUserdata): %u\n",
                     d->taskRecvMulticastUserdata.sock.port);
     }

diff --git a/orte/liborte/RTPSCSTReaderProc.c b/orte/liborte/RTPSCSTReaderProc.c
index 7cd8ae48a7264436aefea334f4dfc548d8c5f23c..cf28d81a064f3d98876e4a3f27ea6ab6c74a28ff 100644 (file)
--- a/orte/liborte/RTPSCSTReaderProc.c
+++ b/orte/liborte/RTPSCSTReaderProc.c
@@ -169,7 +169,7 @@ CSTReaderNewData(CSTRemoteWriter *cstRemoteWriter,
   ORTERecvInfo         info;  
   ORTESubsProp         *sp;
   ObjectEntryOID       *objectEntryOID;\r
-  int                 max_size;
+  unsigned int                max_size;
         
   if (cstRemoteWriter==NULL) return;
   objectEntryOID=cstRemoteWriter->cstReader->objectEntryOID;

diff --git a/orte/liborte/RTPSInfoDST.c b/orte/liborte/RTPSInfoDST.c
index 75fe0a32e720b90c01ed71b5bcdbd42fab4cf1f3..066c53de0f58e082e034effe173e992467d6faf5 100644 (file)
--- a/orte/liborte/RTPSInfoDST.c
+++ b/orte/liborte/RTPSInfoDST.c
@@ -31,12 +31,12 @@ void RTPSInfoDST(CDR_Codec *cdrCodec,MessageInterpret *mi) {
   cdrCodec->data_endian=FLAG_BIG_ENDIAN;
 
   /* Host Id */
-  CDR_put_ulong(cdrCodec,                          
-               *(CORBA_unsigned_long*)&hid);
+  CDR_get_ulong(cdrCodec,                          
+               (CORBA_unsigned_long*)&hid);
 
   /* App Id */
-  CDR_put_ulong(cdrCodec,                          
-               *(CORBA_unsigned_long*)&aid);
+  CDR_get_ulong(cdrCodec,                          
+               (CORBA_unsigned_long*)&aid);
 
   cdrCodec->data_endian=data_endian;
 

diff --git a/orte/liborte/RTPSIssue.c b/orte/liborte/RTPSIssue.c
index a0c0a8679ba8dcd5d46ea504a95cf4b6826f8415..334ff6a2f24c179beaadce2600845b67b3e298dc 100644 (file)
--- a/orte/liborte/RTPSIssue.c
+++ b/orte/liborte/RTPSIssue.c
@@ -38,7 +38,7 @@ RTPSIssueCreateHeader(CDR_Codec *cdrCodec,uint32_t length,
   CDR_put_octet(cdrCodec,flags);
 
   /* length */
-  CDR_put_ushort(cdrCodec,length);
+  CDR_put_ushort(cdrCodec,(CORBA_unsigned_short)length);
 
   data_endian=cdrCodec->data_endian;
   cdrCodec->data_endian=FLAG_BIG_ENDIAN;

diff --git a/orte/liborte/RTPSVar.c b/orte/liborte/RTPSVar.c
index aa497be6a323812bd1ba306439f479a2cb1f63dd..f0130da4b77c38ac2a71a7568a1dac6a6a271f29 100644 (file)
--- a/orte/liborte/RTPSVar.c
+++ b/orte/liborte/RTPSVar.c
@@ -91,7 +91,7 @@ RTPSVarCreate(CDR_Codec *cdrCodec,ObjectId roid,ObjectId woid,CSChange *csChange
  
   /* length */
   cdrCodec->wptr=swptr+2;
-  CDR_put_ushort(cdrCodec,len-4);
+  CDR_put_ushort(cdrCodec,(CORBA_unsigned_short)(len-4));
 
   cdrCodec->wptr=swptr+len;
 

diff --git a/orte/liborte/msvc/Makefile.msc b/orte/liborte/msvc/Makefile.msc
index 22b90088ede3160d3f75aad4cb753ed3dab5566c..dfb679752c72085a6edff0ee87ffca52f6af3215 100644 (file)
--- a/orte/liborte/msvc/Makefile.msc
+++ b/orte/liborte/msvc/Makefile.msc
@@ -9,50 +9,50 @@ CFLAGS = -c -Zi -MD $(INCLUDE)
 LIB_CFLAGS=    $(CFLAGS) -LD
 INCLUDE=       -I$(MSCDIR)\include -I..\..\include -I..\..\include\win32
 ORTELIB_OBJS= \
-       "..\ul_gavlprim.obj" \
-       "..\conv.obj" \
-       "..\debug.obj" \
-       "..\event.obj" \
-       "..\fnmatch.obj" \
-       "..\htimerNtp.obj" \
-       "..\objectEntry.obj" \
-       "..\objectEntryTimer.obj" \
-       "..\objectUtils.obj" \
-       "..\ORTEAppRecvMetatrafficThread.obj" \
-       "..\ORTEAppRecvUserdataThread.obj" \
-       "..\ORTEAppSendThread.obj" \
-       "..\ORTEDomain.obj" \
-       "..\ORTEDomainApp.obj" \
-       "..\ORTEDomainMgr.obj" \
-       "..\ORTEInit.obj" \
-       "..\ORTEMisc.obj" \
-       "..\ORTEPattern.obj" \
-       "..\ORTEPublication.obj" \
-       "..\ORTEPublicationTimer.obj" \
-       "..\ORTESubscription.obj" \
-       "..\ORTEThreadUtils.obj" \
-       "..\ORTETypeRegister.obj" \
-       "..\ORTEVerbosity.obj" \
-       "..\parameter.obj" \
-       "..\RTPSAck.obj" \
-       "..\RTPSCSTReader.obj" \
-       "..\RTPSCSTReaderProc.obj" \
-       "..\RTPSCSTReaderTimer.obj" \
-       "..\RTPSCSTWriter.obj" \
-       "..\RTPSCSTWriterTimer.obj" \
-       "..\RTPSGap.obj" \
-       "..\RTPSHeader.obj" \
-       "..\RTPSHeardBeat.obj" \
-       "..\RTPSInfoDST.obj" \
-       "..\RTPSInfoREPLY.obj" \
-       "..\RTPSInfoSRC.obj" \
-       "..\RTPSInfoTS.obj" \
-       "..\RTPSIssue.obj" \
-       "..\RTPSPad.obj" \
-       "..\RTPSUtils.obj" \
-       "..\RTPSVar.obj" \
-       "..\sock.obj" \
-       "..\ul_gavl.obj"
+       "..\cdr.c" \
+       "..\conv.c" \
+       "..\debug.c" \
+       "..\event.c" \
+       "..\fnmatch.c" \
+       "..\htimerNtp.c" \
+       "..\objectEntry.c" \
+       "..\objectEntryTimer.c" \
+       "..\objectUtils.c" \
+       "..\ORTEAppRecvThread.c" \
+       "..\ORTEAppSendThread.c" \
+       "..\ORTEDomainApp.c" \
+       "..\ORTEPublication.c" \
+       "..\ORTEPublicationTimer.c" \
+       "..\ORTESubscription.c" \
+       "..\ORTEDomain.c" \
+       "..\ORTEDomainMgr.c" \
+       "..\ORTEInit.c" \
+       "..\ORTEThreadUtils.c" \
+       "..\ORTETypeRegister.c" \
+       "..\ORTEVerbosity.c" \
+       "..\ORTEPattern.c" \
+       "..\ORTEMisc.c" \
+       "..\parameter.c" \
+       "..\RTPSAck.c" \
+       "..\RTPSCSTReader.c" \
+       "..\RTPSCSTReaderTimer.c" \
+       "..\RTPSCSTReaderProc.c" \
+       "..\RTPSCSTWriter.c" \
+       "..\RTPSCSTWriterTimer.c" \
+       "..\RTPSGap.c" \
+       "..\RTPSHeader.c" \
+       "..\RTPSHeardBeat.c" \
+       "..\RTPSInfoDST.c" \
+       "..\RTPSInfoREPLY.c" \
+       "..\RTPSInfoSRC.c" \
+       "..\RTPSInfoTS.c" \
+       "..\RTPSPad.c" \
+       "..\RTPSUtils.c" \
+       "..\RTPSVar.c" \
+       "..\RTPSIssue.c" \
+       "..\sock.c" \
+       "..\ul_gavl.c" \
+       "..\ul_gavlprim.c"
 
 CC=                $(MSCDIR)\bin\cl
 LINK=          $(MSCDIR)\bin\link

diff --git a/orte/liborte/msvc/liborte.dsp b/orte/liborte/msvc/liborte.dsp
index a04d3fbe2f1111fa473da62355ef77f9b103bb99..b9bba6cb3b0ebe98ad4a2c84a02a917969e5f861 100644 (file)
--- a/orte/liborte/msvc/liborte.dsp
+++ b/orte/liborte/msvc/liborte.dsp
@@ -54,6 +54,10 @@ LIB32=link.exe -lib
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
 # Begin Source File\r
 \r
+SOURCE=..\cdr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\conv.c\r
 # End Source File\r
 # Begin Source File\r
@@ -86,11 +90,7 @@ SOURCE=..\objectUtils.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\ORTEAppRecvMetatrafficThread.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ORTEAppRecvUserdataThread.c\r
+SOURCE=..\ORTEAppRecvThread.c\r
 # End Source File\r
 # Begin Source File\r
 \r

diff --git a/orte/liborte/parameter.c b/orte/liborte/parameter.c
index 9cc3f056507b8631072885447bf395963ca0ebf4..8fefbb3859f3876024e2953787c778cda175a038 100644 (file)
--- a/orte/liborte/parameter.c
+++ b/orte/liborte/parameter.c
@@ -145,7 +145,7 @@ parameterCodeCodecFromCSChange(CSChange *csChange,CDR_Codec *cdrCodec)
         }
        len+=4;                           //data size
        cdrCodec->wptr-=2;                //new alignments value 
-        if (CDR_put_ushort(cdrCodec,len)==CORBA_FALSE) return -1;      
+        if (CDR_put_ushort(cdrCodec,(CORBA_unsigned_short)len)==CORBA_FALSE) return -1;        
 
         if (ps->parameterLength>MAX_PARAMETER_LOCAL_LENGTH) {
           if (CDR_put_string(cdrCodec,(char*)ps->parameter)==

diff --git a/orte/manager/ortemanager.c b/orte/manager/ortemanager.c
index 9afac92479c001feed708ffa971a9719f6949951..4b9bfb5d6c5a3846e5d021b68a4c8a7a68aa1ad4 100644 (file)
--- a/orte/manager/ortemanager.c
+++ b/orte/manager/ortemanager.c
@@ -57,7 +57,7 @@ int managerInit(void) {
   return 0;
 }
 int managerStart(void) {
-  ORTEDomainStart(d,ORTE_TRUE,ORTE_FALSE,ORTE_TRUE);
+  ORTEDomainStart(d,ORTE_TRUE,ORTE_FALSE,ORTE_FALSE,ORTE_FALSE,ORTE_TRUE);
   return 0;
 }
 int managerStop(void) {
@@ -251,12 +251,10 @@ int main(int argc,char *argv[]) {
     daemonInit();
   #endif
 
-  ORTEDomainStart(d,ORTE_TRUE,ORTE_FALSE,ORTE_FALSE,ORTE_FALSE,ORTE_FALSE);
-/*  #ifndef CONFIG_ORTE_UNIX
-    d->taskSend.terminate=ORTE_FALSE;
-    ORTEAppSendThread(d);
-  #endif*/
-  ORTEDomainStart(d,ORTE_FALSE,ORTE_FALSE,ORTE_FALSE,ORTE_FALSE,ORTE_TRUE);
+  ORTEDomainStart(d,ORTE_TRUE,ORTE_FALSE,ORTE_FALSE,ORTE_FALSE,ORTE_TRUE);
+  #ifndef CONFIG_ORTE_UNIX
+     while(1) ORTESleepMs(1000);
+  #endif
 
   #ifdef CONFIG_ORTE_UNIX
   waitForEndingCommand();

diff --git a/switch2standalone b/switch2standalone
index 4eadb8242d9b0dfac37c18e87e52eac21b85c359..bd1054994896a2ee1beab7ae1a156e76fa45bd5e 100755 (executable)
--- a/switch2standalone
+++ b/switch2standalone
@@ -4,7 +4,7 @@
 # without OCERA framework
 
 if [ ! -e Makefile.rules-ocera ] ; then
-#  cp Makefile.rules Makefile.rules-ocera
+  cp Makefile.rules Makefile.rules-ocera
 fi
 
 if [ -e OCERA_TOP_DIR ] ; then