Changeset 2884 in Sophya

Timestamp:

Jan 4, 2006, 2:30:31 PM (20 years ago)

Author:

ansari

Message:

Modifs pour compilation avec g++ 4 (V >= 3.4) - Reza 4 Jan 2006

Location:

trunk/SophyaLib

Files:

• BaseTools/datatype.cc (modified) (1 diff)
• BaseTools/machdefs_mkmf.h (modified) (5 diffs)
• BaseTools/mutyv.cc (modified) (1 diff)
• BaseTools/mutyv.h (modified) (1 diff)
• BaseTools/segdatablock.h (modified) (1 diff)
• TArray/tarray.cc (modified) (2 diffs)
• TArray/tmatrix.h (modified) (1 diff)
• TArray/tmatrix_tsnl.h (added)
• TArray/tvector.h (modified) (1 diff)
• TArray/tvector_tsnl.h (added)

trunk/SophyaLib/BaseTools/datatype.cc

@@ -34 +34 @@
 template <class T>
 string DataTypeInfo<T>::getTypeName() { return("???unknowntype???"); }
+DECL_TEMP_SPEC
 string DataTypeInfo<uint_1>::getTypeName() { return("uint_1"); }
+DECL_TEMP_SPEC
 string DataTypeInfo<uint_2>::getTypeName() { return("uint_2"); }
+DECL_TEMP_SPEC
 string DataTypeInfo<int_2>::getTypeName() { return("int_2"); }
+DECL_TEMP_SPEC
 string DataTypeInfo<int_4>::getTypeName() { return("int_4"); }
+DECL_TEMP_SPEC
 string DataTypeInfo<int_8>::getTypeName() { return("int_8"); }
+DECL_TEMP_SPEC
 string DataTypeInfo<uint_4>::getTypeName() { return("uint_4"); }
+DECL_TEMP_SPEC
 string DataTypeInfo<uint_8>::getTypeName() { return("uint_8"); }
+DECL_TEMP_SPEC
 string DataTypeInfo<r_4>::getTypeName() { return("r_4"); }
+DECL_TEMP_SPEC
 string DataTypeInfo<r_8>::getTypeName() { return("r_8"); }
+DECL_TEMP_SPEC
 string DataTypeInfo< complex<r_4> >::getTypeName() { return(" complex<r_4> "); }
+DECL_TEMP_SPEC
 string DataTypeInfo< complex<r_8> >::getTypeName() { return(" complex<r_8> "); }
 #endif

trunk/SophyaLib/BaseTools/machdefs_mkmf.h

@@ -222 +222 @@
 /*    __KCC__      : KCC, version >= 3.3 is required                   */
 /*    __SGICC__    : SGI (IRIX64) CC compiler                          */
+/*    __INTEL_COMPILER :   : INTEL compiler                            */
+/*    __IBMCPP__   : AIX (IBM) xlC c++ compiler                        */
 
 /***********************************************************************/
 /* Compiler-specific stuff                                             */
 /***********************************************************************/
-
-/* Some features will be *required* for Planck. Which ones ?               */
   
 /*   ANSI_TEMPLATES        : use ANSI syntax for explicit templates        */
@@ -245 +245 @@
 /*   NO_IOS_COMPLEX        : does not have operator << defined for complex */
 /*   DECL_TEMP_SPEC        : Template specialization declaration           */
+/*   TSNMLUPG4             : Two stage name look-up scheme (g++>3.4)       */
 
 
@@ -269 +270 @@
 #endif
 
+/* Most compilers dot not implement two level name lookup for templates 
+   introduced by gcc >= 3.4 
+*/
+#ifdef TSNMLUPG4
+#undef TSNMLUPG4
+#endif
 
 /* now the specific things */
@@ -284 +291 @@
 
 #ifdef __GNUG__
+#define GCC_VERSION (__GNUC__ * 10000 \
+                               + __GNUC_MINOR__ * 100 \
+                               + __GNUC_PATCHLEVEL__)
 #define ANSI_TEMPLATES
 /*
@@ -294 +304 @@
 #define HAS_IOS_BIN
 #define HAS_IOS_NOCREATE
+#if ( GCC_VERSION >= 30000 ) 
+#undef  DECL_TEMP_SPEC
+#define DECL_TEMP_SPEC template <>
+#endif
+#if ( GCC_VERSION >= 34000 )
+/* Two level name look-up scheme for templates introduced from gcc 3.4 */
+#define TSNMLUPG4
+#endif
+
 #endif
 

trunk/SophyaLib/BaseTools/mutyv.cc

@@ -150 +150 @@
 
 /* --Methode-- */
+string & MuTyV::Convert(string & x) const 
+{
+  if (typ == MTVString)  x = *strv;
+  else if (typ == MTVTimeStamp) { x = TimeStamp(dv).ToString(); }
+  else {
+    char buff[96];
+    if (typ == MTVInteger)  sprintf(buff,"%ld", (long)iv);
+    else if (typ == MTVFloat) sprintf(buff,"%g", dv);
+    else if (typ == MTVComplex) sprintf(buff,"(%g,%g)", dv, dv_im);
+    else buff[0] = '\0';
+    x = buff;
+  }
+  return x;
+}
+
+/* --Methode-- */
 MuTyV::operator TimeStamp() const 
 {
   return TimeStamp(dv);
+}
+
+/* --Methode-- */
+TimeStamp& MuTyV::Convert(TimeStamp& x) const 
+{
+  x = TimeStamp(dv);
+  return x;
 }
 

trunk/SophyaLib/BaseTools/mutyv.h

@@ -77 +77 @@
          operator TimeStamp() const ; 
 
+  inline uint_2 Convert(uint_2& x) const { x = (uint_2)iv; return x; }
+  inline uint_4 Convert(uint_4& x) const { x = (uint_4)iv; return x; }
+  inline uint_8 Convert(uint_8& x) const { x = (uint_8)iv; return x; }
+  inline int_4 Convert(int_4& x) const { x = (int_4)iv; return x; }
+  inline int_8 Convert(int_8& x) const { x = iv; return x; }
+  inline r_4 Convert(r_4& x) const { x = (r_4)dv; return x; }
+  inline r_8 Convert(r_8& x) const { x = dv; return x; }
+  inline complex<r_4> Convert(complex<r_4> & x) const 
+    { x = complex< r_4 > ((r_4)dv, (r_4)dv_im); return x; }
+  inline complex<r_8> Convert(complex<r_8> & x) const 
+    { x = complex< r_8 > (dv, dv_im); return x; }
+  
+  string&  Convert(string& x) const ; 
+  TimeStamp& Convert(TimeStamp& x) const ; 
+
   inline MTVType Type() const { return typ; }
   inline int_8   GetIntPart() const { return iv; }

trunk/SophyaLib/BaseTools/segdatablock.h

@@ -91 +91 @@
   {
     SegDataBlock<T> * sdb = dynamic_cast< SegDataBlock<T> *>(&a);
-    if (p != NULL) { 
-      mSRef = p->mSRef;
+    if (sdb != NULL) { 
+      mSRef = sdb->mSRef;
       mSRef->nref++;
     }

trunk/SophyaLib/TArray/tarray.cc

@@ -476 +476 @@
    --- Appel explicite de l'operateur de conversion sur l'objet MuTyV 
 */
-    for(k=0; k<gpas; k++)  pe[k*step] = seq(j*gpas+k).operator T();
+    for(k=0; k<gpas; k++)  seq(j*gpas+k).Convert(pe[k*step]);
+//REMPLACE suite pb compil gcc4    for(k=0; k<gpas; k++)  pe[k*step] = seq(j*gpas+k).operator T();
   }
   return(*this);
@@ -1113 +1114 @@
 */
     for(k=0, ka=0;  k<gpas;  k+=step, ka+=stepa)  
-      pe[k] = a.ValueAtPosition(offa+ka).operator T(); 
+      a.ValueAtPosition(offa+ka).Convert(pe[k]); 
+      //REMPLACE Suite pb compil gcc4   pe[k] = a.ValueAtPosition(offa+ka).operator T(); 
   }
   return(*this);

trunk/SophyaLib/TArray/tmatrix.h

@@ -13 +13 @@
 class TMatrix : public TArray<T> {
 public:
+
+#include "tmatrix_tsnl.h"  /* For two level name look-up gcc >= 3.4 */
+
   // Creation / destruction 
   TMatrix();

trunk/SophyaLib/TArray/tvector.h

@@ -12 +12 @@
 class TVector : public TMatrix<T> {
 public:
+
+#include "tvector_tsnl.h"  /* For two level name look-up gcc >= 3.4 */
+
   // Creation / destruction 
   TVector();