Changeset 18058 for trunk/FACT++/dim/src/examples

Timestamp:

01/03/15 18:26:23 (10 years ago)

Author:

tbretz

Message:

Updated to v20r11

Location:

trunk/FACT++/dim/src/examples

Files:

• pvss_dim_client.cxx (modified) (4 diffs)
• pvss_dim_server.cxx (modified) (3 diffs)
• rpc_client.cxx (modified) (5 diffs)
• rpc_server.cxx (modified) (4 diffs)

trunk/FACT++/dim/src/examples/pvss_dim_client.cxx

@@ -19 +19 @@
         }
 public :
-        SimpleService(char *name) : DimInfo(name, -1.0) {};
+        SimpleService(const char *name) : DimInfo(name, -1.0) {};
 };
 
@@ -39 +39 @@
         }
 public :
-        DimDoubleArray(char *name) : DimInfo(name, no_link_darray, 8*sizeof(double)) {};
+        DimDoubleArray(const char *name) : DimInfo(name, no_link_darray, 8*sizeof(double)) {};
 };
 
@@ -76 +76 @@
         }
 public :
-        ComplexService(char *name) : DimInfo(name, -1.0) {};
+        ComplexService(const char *name) : DimInfo(name, -1.0) {};
 };
 
@@ -88 +88 @@
                 cout << "RPC Service received: " << value << "\n" << endl;
         }
-        RpcService(char *name, int timeout) :   DimRpcInfo(name, timeout, -1) {};
+        RpcService(const char *name, int timeout) :     DimRpcInfo(name, timeout, -1) {};
 };
 

trunk/FACT++/dim/src/examples/pvss_dim_server.cxx

@@ -31 +31 @@
         }
 public :
-        RecvCommand(char *name) : DimCommand(name,"C") {reset_flag = 0;};
+        RecvCommand(const char *name) : DimCommand(name,"C") {reset_flag = 0;};
         int isReset() {return reset_flag;};
         void clearReset() {reset_flag = 0;};
@@ -47 +47 @@
         }
 public :
-        RecvCommandComplex(char *name) : DimCommand(name,"I:1;C:1;I:1;F:1;C") {};
+        RecvCommandComplex(const char *name) : DimCommand(name,"I:1;C:1;I:1;F:1;C") {};
 };
 /*
@@ -95 +95 @@
         }
 public:
-        RpcService(char *name): DimRpc(name,"I","I") {val = 0;};
+        RpcService(const char *name): DimRpc(name,"I","I") {val = 0;};
 };
 

trunk/FACT++/dim/src/examples/rpc_client.cxx

@@ -2 +2 @@
 #include <iostream>
 using namespace std;
+#include <stdio.h>
 
 class Rpc : public DimRpcInfo
@@ -10 +11 @@
                 cout << "Callback RPC Received : " << getInt() << endl;
         }
-        Rpc(char *name) :       DimRpcInfo(name, 1, -1) {};
+        Rpc(const char *name) : DimRpcInfo(name, 1, -1) {};
 };
 
@@ -31 +32 @@
                 cout << val->str1 << " " << val->str2 << " " << val->int1 << endl;
         }
-        RpcStruct(char *name) : DimRpcInfo(name, "dead") {};
+        RpcStruct(const char *name) :   DimRpcInfo(name, (char *)"dead") {};
 };
 
@@ -41 +42 @@
         int out, in;
         
-        sprintf(name,"TESTRPC%d/INT",(dim_long)tag);
+        sprintf(name,"TESTRPC%ld/INT",(dim_long)tag);
         myRpc = new DimRpcInfo(name, 10, -1);
 //      myRpc = new Rpc(name);
@@ -65 +66 @@
         Rpc *myRpc;
         char name[64];
-        int out, in;
+        int out;
         
         sprintf(name,"TESTRPC/INT");

trunk/FACT++/dim/src/examples/rpc_server.cxx

@@ -3 +3 @@
 #include <iostream>
 using namespace std;
+#include <stdio.h>
 
 class RpcInt : public DimRpc
@@ -20 +21 @@
         }
 public:
-        RpcInt(char *name): DimRpc(name,"I","I") {val = 0;};
+        RpcInt(const char *name): DimRpc(name,"I","I") {val = 0;};
 };
 
@@ -56 +57 @@
         }
 public:
-        RpcStruct(char *name): DimRpc(name,"C:16;I:5;C:18;F:4;I:1;F:16",
+        RpcStruct(const char *name): DimRpc(name,"C:16;I:5;C:18;F:4;I:1;F:16",
                 "C:16;I:5;C:18;F:4;I:1;F:16") {val = 0;};
 };
@@ -75 +76 @@
         }
 public:
-        JeffRpcStruct(char *name): DimRpc(name,"C:1;C:1;C:1;C",
+        JeffRpcStruct(const char *name): DimRpc(name,"C:1;C:1;C:1;C",
                 "I:1;C:1;C") {counter = 0;};
 };