Changeset 2344 in Sophya

Timestamp:

Mar 10, 2003, 4:13:49 PM (23 years ago)

Author:

ansari

Message:

Compilation (fin ?) avec SGI-CC -LANG:std - Reza 10/03/2003

Location:

trunk/SophyaLib

Files:

• BaseTools/datatype.cc (modified) (2 diffs)
• BaseTools/sversion.h (modified) (1 diff)
• NTools/fftservintf.cc (modified) (2 diffs)
• NTools/generaldata.cc (modified) (2 diffs)
• NTools/poly.cc (modified) (4 diffs)
• SkyT/gaussfilt.cc (modified) (3 diffs)
• SkyT/specrespvector.cc (modified) (3 diffs)

trunk/SophyaLib/BaseTools/datatype.cc

@@ -12 +12 @@
 {
 }
-/*
 #if defined(__SGICC__)
 template <class T>
-string DataTypeInfo<T>::getTypeName() 
-{ 
-  if (typeid(T) == typeid(uint_1)) return("uint_1"); 
+string DataTypeInfo<T>::getTypeName()
+{
+  if (typeid(T) == typeid(uint_1)) return("uint_1");
   else if (typeid(T) == typeid(uint_2)) return("uint_2");
   else if (typeid(T) == typeid(int_2)) return("int_2");
@@ -31 +30 @@
 }
 #else
-*/
-DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
+template <class T>
+string DataTypeInfo<T>::getTypeName() { return("???unknowntype???"); }
 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
-*/
+
 
 string DecodeGCCTypeName(string gcctype)

trunk/SophyaLib/BaseTools/sversion.h

@@ -3 +3 @@
 
 #define SOPHYA_VERSION   1.6
-#define SOPHYA_REVISION  00
+#define SOPHYA_REVISION  02
 #define SOPHYA_TAG       "V_Fev2003"
 

trunk/SophyaLib/NTools/fftservintf.cc

@@ -253 +253 @@
 }
 
-#if defined(__SGICC__)
-template <>
-#endif
+DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
 r_8 FFTArrayChecker< r_8 >::ZeroThreshold()
 {
@@ -261 +259 @@
 }
 
-#if defined(__SGICC__)
-template <>
-#endif
+DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
 r_4 FFTArrayChecker< r_4 >::ZeroThreshold()
 {

trunk/SophyaLib/NTools/generaldata.cc

@@ -1061 +1061 @@
 
 
-#if defined(__SGICC__)
-template <>
-#endif
+DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
 void ObjFileIO<GeneralFitData>::ReadSelf(PInPersist& is)
 {
@@ -1108 +1106 @@
 }
 
-#if defined(__SGICC__)
-template <>
-#endif
+DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
 void ObjFileIO<GeneralFitData>::WriteSelf(POutPersist& os) const
 {

trunk/SophyaLib/NTools/poly.cc

@@ -306 +306 @@
 //////////////////////////////////////////////////////////////////////////
 //! For persistance management
-#if defined(__SGICC__)
-template <>
-#endif
+DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
 void ObjFileIO<Poly>::ReadSelf(PInPersist& is)
 {
@@ -320 +318 @@
 
 //! For persistance management
-#if defined(__SGICC__)
-template <>
-#endif
+DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
 void ObjFileIO<Poly>::WriteSelf(POutPersist& os) const
 {
@@ -771 +767 @@
 //////////////////////////////////////////////////////////////////////////
 //! For persistance management
-#if defined(__SGICC__)
-template <>
-#endif
+DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
 void ObjFileIO<Poly2>::ReadSelf(PInPersist& is)
 {
@@ -785 +779 @@
 
 //! For persistance management
-#if defined(__SGICC__)
-template <>
-#endif
+DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
 void ObjFileIO<Poly2>::WriteSelf(POutPersist& os) const
 {

trunk/SophyaLib/SkyT/gaussfilt.cc

@@ -1 +1 @@
 //--------------------------------------------------------------------------
 // File and Version Information:
-//      $Id: gaussfilt.cc,v 1.7 2003-02-11 15:31:07 cmv Exp $
+//      $Id: gaussfilt.cc,v 1.8 2003-03-10 15:13:49 ansari Exp $
 //
 // Description:
@@ -104 +104 @@
 }
 
+DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
 void
 ObjFileIO<GaussianFilter>::WriteSelf(POutPersist& s) const
@@ -125 +126 @@
 }
 
+DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
 void
 ObjFileIO<GaussianFilter>::ReadSelf(PInPersist& s)  

trunk/SophyaLib/SkyT/specrespvector.cc

@@ -1 +1 @@
 //--------------------------------------------------------------------------
 // File and Version Information:
-//      $Id: specrespvector.cc,v 1.9 2003-02-11 15:31:07 cmv Exp $
+//      $Id: specrespvector.cc,v 1.10 2003-03-10 15:13:49 ansari Exp $
 //
 // Description:
@@ -124 +124 @@
 
 
+DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
 void
 ObjFileIO<SpecRespVec>::WriteSelf(POutPersist& s) const
@@ -152 +153 @@
 }
 
+DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
 void 
 ObjFileIO<SpecRespVec>::ReadSelf(PInPersist& s)