Changeset 174 in Sophya

Timestamp:

Dec 23, 1998, 12:50:10 PM (27 years ago)

Author:

ercodmgr

Message:

Modif pour compil gcc 2.7.2 Reza 23/12/98

Location:

trunk/SophyaPI/PIext

Files:

• piacmd.cc (modified) (5 diffs)
• piacmd.h (modified) (1 diff)

trunk/SophyaPI/PIext/piacmd.cc

@@ -155 +155 @@
   cout << "exec filename   --   set varname string  --  clr varname  --  listvars \n"; 
   cout << "traceon/off  --  timingon/off  --  shell cmdline\n";
-  cout << "link fnameso f1 [f2 f3 f4 f5]  --   call userf [arg1 arg2 ...]\n";
+  cout << "link fnameso f1 [f2 f3]  --   call userf [arg1 arg2 ...]\n";
   cout << "zone nx ny  --  gratt attributes_list  --  stacknext \n";
   cout << "openfits file -- openppf file -- saveall file -- listobjs --\n";
@@ -234 +234 @@
 // >>>>>>>>>>> Link dynamique de fonctions C++
 else if (kw == "link" ) {
-  if (tokens.size() < 2) { cout << "PIACmd::Do() Usage: link fnameso f1 [f2 f3 f4 f5]" << endl;  return(0); }
+  if (tokens.size() < 2) { cout << "PIACmd::Do() Usage: link fnameso f1 [f2 f3]" << endl;  return(0); }
   string sph = "";
-  for(int gg=0; gg<4; gg++)   tokens.push_back(sph);
-  int rc = LinkUserFuncs(tokens[0], tokens[1], tokens[2], tokens[3], tokens[4], tokens[5]);
+  for(int gg=0; gg<5; gg++)   tokens.push_back(sph);
+  int rc = LinkUserFuncs(tokens[0], tokens[1], tokens[2], tokens[3]);
   if (rc == 0)  cout << "PIAcmd::Do(): Link from " << tokens[0] << " OK " << endl;
 }
@@ -594 +594 @@
 
 /* --Methode-- */
-int PIACmd::LinkUserFuncs(string& fnameso, string& func1, string& func2, string& func3, 
-                          string& func4, string& func5)
+int PIACmd::LinkUserFuncs(string& fnameso, string& func1, string& func2, string& func3)
+//                          string& func4, string& func5)
 {
 string cmd;
@@ -634 +634 @@
 else cerr << "PIACmd/LinkUserFuncs_Erreur: Erreur linking " << func3 << endl;
 
+/*  Pb compile g++ 2.7.2 
 if ((func4.length() < 1) || (func4 == "-") || (func4 == ".") )  goto fin;
 // f = (DlUserProcFunction)  dlsym(dlhandle, func4.c_str());
@@ -645 +646 @@
 if (f) { nok++;  usfmap[func5] = f; }
 else cerr << "PIACmd/LinkUserFuncs_Erreur: Erreur linking " << func5 << endl;
-
+*/
 fin:
 if (nok < 1) { if (dynlink) delete dynlink;    dynlink = NULL;  return(3); }

trunk/SophyaPI/PIext/piacmd.h

@@ -34 +34 @@
 
 //  Link dynamique de fonction user
-  int           LinkUserFuncs(string& fnameso, string& func1, string& func2, string& func3,
-                              string& func4, string& func5);
+  int           LinkUserFuncs(string& fnameso, string& func1, string& func2, string& func3);
+//                            string& func4, string& func5);   compil avec g++ 2.7.2
   NamedObjMgr* mObjMgr;
   PIStdImgApp* mImgApp;