Changeset 2867 in Sophya for trunk/SophyaLib/BaseTools

Timestamp:

Jan 3, 2006, 3:18:57 PM (20 years ago)

Author:

ansari

Message:

Portage/compilation sur AIX-XlC (regatta) - Reza 3 Jan 2006

Location:

trunk/SophyaLib/BaseTools

Files:

• datatype.cc (modified) (4 diffs)
• fiondblock.cc (modified) (2 diffs)
• machdefs_mkmf.h (modified) (1 diff)
• ndatablock.cc (modified) (2 diffs)

trunk/SophyaLib/BaseTools/datatype.cc

@@ -6 +6 @@
 #include "sopnamsp.h"
 #include "datatype.h"
+#include "typeinfo.h"
 
 #include <complex>
@@ -13 +14 @@
 {
 }
-#if defined(__SGICC__)
+#if defined(__SGICC__) || defined(__IBMCPP__)
 template <class T>
 string DataTypeInfo<T>::getTypeName()
@@ -116 +117 @@
 
 #if defined(ANSI_TEMPLATES) || defined(GNU_TEMPLATES)
+namespace SOPHYA {
 template class DataTypeInfo<uint_1>;
 template class DataTypeInfo<uint_2>;
@@ -127 +129 @@
 template class DataTypeInfo< complex<r_4> >;
 template class DataTypeInfo< complex<r_8> >;
+}
 #endif

trunk/SophyaLib/BaseTools/fiondblock.cc

@@ -186 +186 @@
 
 #if defined(ANSI_TEMPLATES) || defined(GNU_TEMPLATES)
+namespace SOPHYA {
 // Instances des delegues FileIO (PPersist)
 template class FIO_NDataBlock<uint_1>;
@@ -198 +199 @@
 template class FIO_NDataBlock< complex<r_4> >;
 template class FIO_NDataBlock< complex<r_8> >;
+}
 #endif

trunk/SophyaLib/BaseTools/machdefs_mkmf.h

@@ -321 +321 @@
 #ifndef ANSI_TEMPLATES
 #define ANSI_TEMPLATES
+#endif
 #undef  DECL_TEMP_SPEC
 #define DECL_TEMP_SPEC template <>
 #endif
+
+#if defined(__IBMCPP__)
+/* IBM xlC compiler support Added : dec 2005 */
+#ifndef ANSI_TEMPLATES
+#define ANSI_TEMPLATES
+#endif
+#undef  DECL_TEMP_SPEC
+#define DECL_TEMP_SPEC template <>
 #endif
 

trunk/SophyaLib/BaseTools/ndatablock.cc

@@ -789 +789 @@
 
 #if defined(ANSI_TEMPLATES) || defined(GNU_TEMPLATES)
+namespace SOPHYA {
 template class NDataBlock<uint_1>;
 template class NDataBlock<uint_2>;
@@ -800 +801 @@
 template class NDataBlock< complex<r_4> >;
 template class NDataBlock< complex<r_8> >;
+}
 #endif