Changeset 164 in Sophya

Timestamp:

Dec 17, 1998, 2:58:34 AM (27 years ago)

Author:

ercodmgr

Message:

Modif mineure (const_cast conditionnel) Reza 17/12/98

Location:

trunk/SophyaPI/PI

Files:

• pilistx.cc (modified) (1 diff)
• piwdgx.cc (modified) (1 diff)
• psfile.cc (modified) (2 diffs)

trunk/SophyaPI/PI/pilistx.cc

@@ -107 +107 @@
 mNItem++;
 
-#if defined(__xlC)
+#if defined(__DECCXX) || defined(__KCC__) || defined(__aCC__)
+XmString xms = XmStringCreate(const_cast<char *>(item), XmSTRING_DEFAULT_CHARSET);
+#else
 XmString xms = XmStringCreate((char *)(item), XmSTRING_DEFAULT_CHARSET);
-#else
-XmString xms = XmStringCreate(const_cast<char *>(item), XmSTRING_DEFAULT_CHARSET);
 #endif
 XmListAddItem(mlist, xms, 0);

trunk/SophyaPI/PI/piwdgx.cc

@@ -544 +544 @@
 char **ppc;
 if (narg > 0)  { n = narg, ppc = arg; }
-#if defined(__xlC)
+#if defined(__DECCXX) || defined(__KCC__) || defined(__aCC__)
+else { ppc = const_cast<char **>(&pc); n = 1; }
+#else
 else { ppc = (char **)(&pc); n = 1; }
-#else
-else { ppc = const_cast<char **>(&pc); n = 1; }
 #endif
 //  strncpy(appname, ppc[0], 63); appname[63] = '\0';
 strncpy(appclass,"PeidaInt",63);  appclass[63] = '\0';     
 //  top = XtAppInitialize(&appctx, appclass, NULL, 0, &n, ppc);
-#if defined(__xlC)
+#if defined(__DECCXX) || defined(__KCC__) || defined(__aCC__)
+top = XtVaAppInitialize(&appctx, appclass, NULL, 0, &n, ppc, const_cast<String*>(fallback_res), NULL);
+#else
 top = XtVaAppInitialize(&appctx, appclass, NULL, 0, &n, ppc, (String*)(fallback_res), NULL);
-#else
-top = XtVaAppInitialize(&appctx, appclass, NULL, 0, &n, ppc, const_cast<String*>(fallback_res), NULL);
 #endif
 dpy = XtDisplay(top);

trunk/SophyaPI/PI/psfile.cc

@@ -295 +295 @@
  */
 PSFile::PSFile(const char * FileName, float sc) 
-#if defined(__xlC)
+#if defined(__DECCXX) || defined(__KCC__) || defined(__aCC__)
+    : mPSFileName(FileName==NULL? "unnamed.eps" : const_cast<char *>(FileName)),
+#else
     : mPSFileName(FileName==NULL? "unnamed.eps" : (char *)(FileName)),
-#else
-    : mPSFileName(FileName==NULL? "unnamed.eps" : const_cast<char *>(FileName)),
 #endif
       Tw (-1.), Th(-1.),         /* Non specifies pour du eps  */
@@ -360 +360 @@
                PIPaperSize   paperSize,
                float marginX, float marginY)
-#if defined(__xlC)
+#if defined(__DECCXX) || defined(__KCC__) || defined(__aCC__)
+ :  mPSFileName (FileName == NULL ? "unnamed.ps" : const_cast<char *>(FileName)),
+#else
  :  mPSFileName (FileName == NULL ? "unnamed.ps" : (char *)(FileName)),
-#else
- :  mPSFileName (FileName == NULL ? "unnamed.ps" : const_cast<char *>(FileName)),
 #endif
     Tw(PaperSizeTable[paperSize].width),  /* Format papier utilise */