Changeset 14575 for trunk/FACT++/dim/src/discpp.cxx

Timestamp:

11/07/12 10:47:40 (12 years ago)

Author:

tbretz

Message:

Updated to v20r01.

File:

• trunk/FACT++/dim/src/discpp.cxx (modified) (10 diffs)

trunk/FACT++/dim/src/discpp.cxx

@@ -61 +61 @@
                 itsId = dis_add_service( name, format, NULL, 0, 
 //                              user_routine, itsTagId);
-                                user_routine, (long)this);
+                                user_routine, (dim_long)this);
                 DimServer::start();
         }
@@ -68 +68 @@
                 itsId = dis_add_service_dns( itsDns->getDnsId(), name, format, NULL, 0, 
 //                              user_routine, itsTagId);
-                                user_routine, (long)this);
+                                user_routine, (dim_long)this);
 //              itsDns->addServiceId(itsId);
                 DimServer::start(itsDns);
@@ -139 +139 @@
                 itsId = dis_add_cmnd( name, format, command_routine,
 //                              itsTagId);
-                                (long)this);
+                                (dim_long)this);
                 DimServer::start();
         }
@@ -146 +146 @@
                 itsId = dis_add_cmnd_dns( itsDns->getDnsId(), name, format, command_routine,
 //                      itsTagId);
-                        (long)this);
+                        (dim_long)this);
 //              itsDns->addServiceId(itsId);
                 DimServer::start(itsDns);
@@ -248 +248 @@
                 itsIdIn = dis_add_cmnd( itsNameIn, formatin, 
 //                      rpcin_routine, itsTagId);
-                        rpcin_routine, (long)this);
+                        rpcin_routine, (dim_long)this);
                 itsIdOut = dis_add_service( itsNameOut, formatout, 0,0, 
 //                      rpcout_routine, itsTagId);
-                        rpcout_routine, (long)this);
+                        rpcout_routine, (dim_long)this);
                 DimServer::start();
         }
@@ -258 +258 @@
                 itsIdIn = dis_add_cmnd_dns( itsDns->getDnsId(), itsNameIn, formatin, 
 //                      rpcin_routine, itsTagId);
-                        rpcin_routine, (long)this);
+                        rpcin_routine, (dim_long)this);
                 itsIdOut = dis_add_service_dns( itsDns->getDnsId(), itsNameOut, formatout, 0,0, 
 //                      rpcout_routine, itsTagId);
-                        rpcout_routine, (long)this);
+                        rpcout_routine, (dim_long)this);
 //              itsDns->addServiceId(itsIdIn);
 //              itsDns->addServiceId(itsIdOut);
@@ -369 +369 @@
 }
 
-long DimServerDns::getDnsId()
+dim_long DimServerDns::getDnsId()
 {
         return itsDnsId;
@@ -445 +445 @@
 void DimServer::start(DimServerDns *dns, const char *name)
 {
-        long dnsid;
+        dim_long dnsid;
 
         DISABLE_AST
@@ -487 +487 @@
 void DimServer::start(DimServerDns *dns)
 {
-        long dnsid;
+        dim_long dnsid;
         char *name;
         int isAuto;
@@ -669 +669 @@
 }
 
-long DimServer::addDns(const char *node, int port) 
+dim_long DimServer::addDns(const char *node, int port) 
 {
         return dis_add_dns((char *)node, port);