Changeset 3208 in Sophya for trunk/SophyaLib/BaseTools/datatype.cc

Timestamp:

Apr 10, 2007, 5:57:02 PM (18 years ago)

Author:

ansari

Message:

Ajout classe ThSafeOp (thsafeop.h) pour rendre NDataBlock<T> (et SegDataBlock) thread-safe, ajout methode DataTypeInfo::getTypeId() , implementation ThSafeOp ds ndatablock.cc (.h), Reza 10/04/2007

File:

• trunk/SophyaLib/BaseTools/datatype.cc (modified) (5 diffs)

trunk/SophyaLib/BaseTools/datatype.cc

@@ -14 +14 @@
 {
 }
-#if defined(__SGICC__) || defined(__IBMCPP__)
-template <class T>
-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");
-  else if (typeid(T) == typeid(int_4)) return("int_4");
-  else if (typeid(T) == typeid(int_8)) return("int_8");
-  else if (typeid(T) == typeid(uint_4)) return("uint_4");
-  else if (typeid(T) == typeid(uint_8)) return("uint_8");
-  else if (typeid(T) == typeid(r_4)) return("r_4");
-  else if (typeid(T) == typeid(r_8)) return("r_8");
-  else if (typeid(T) == typeid(complex<r_4>)) return(" complex<r_4> ");
-  else if (typeid(T) == typeid(complex<r_8>)) return(" complex<r_8> ");
-  else return("???unknowntype???");
-}
-#else
+//! Return the type name of T, as a string, (Example: T=uint_8 --> "uint_8")
 template <class T>
 string DataTypeInfo<T>::getTypeName() { return("???unknowntype???"); }
@@ -37 +20 @@
 string DataTypeInfo<uint_1>::getTypeName() { return("uint_1"); }
 DECL_TEMP_SPEC
+string DataTypeInfo<int_1>::getTypeName() { return("int_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<uint_4>::getTypeName() { return("uint_4"); }
+DECL_TEMP_SPEC
 string DataTypeInfo<int_4>::getTypeName() { return("int_4"); }
 DECL_TEMP_SPEC
+string DataTypeInfo<uint_8>::getTypeName() { return("uint_8"); }
+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"); }
@@ -56 +41 @@
 DECL_TEMP_SPEC
 string DataTypeInfo< complex<r_8> >::getTypeName() { return(" complex<r_8> "); }
-#endif
+
+/*! 
+  \ brief Return an identifier associated to T 
+  uint_1 -> 1  , int_1 -> 2
+  uint_2 -> 3  , int_2 -> 4
+  uint_4 -> 5  , int_4 -> 6
+  uint_8 -> 7  , int_8 -> 8
+  r_4    -> 9  , r_8   -> 10
+  complex<r_4> -> 11 , complex<r_8> -> 12
+*/
+template <class T>
+int DataTypeInfo<T>::getTypeId() { return(0); }
+DECL_TEMP_SPEC
+int DataTypeInfo<uint_1>::getTypeId() { return(1); }
+DECL_TEMP_SPEC
+int DataTypeInfo<int_1>::getTypeId() { return(2); }
+DECL_TEMP_SPEC
+int DataTypeInfo<uint_2>::getTypeId() { return(3); }
+DECL_TEMP_SPEC
+int DataTypeInfo<int_2>::getTypeId() { return(4); }
+DECL_TEMP_SPEC
+int DataTypeInfo<uint_4>::getTypeId() { return(5); }
+DECL_TEMP_SPEC
+int DataTypeInfo<int_4>::getTypeId() { return(6); }
+DECL_TEMP_SPEC
+int DataTypeInfo<uint_8>::getTypeId() { return(7); }
+DECL_TEMP_SPEC
+int DataTypeInfo<int_8>::getTypeId() { return(8); }
+DECL_TEMP_SPEC
+int DataTypeInfo<r_4>::getTypeId() { return(9); }
+DECL_TEMP_SPEC
+int DataTypeInfo<r_8>::getTypeId() { return(10); }
+DECL_TEMP_SPEC
+int DataTypeInfo< complex<r_4> >::getTypeId() { return(11); }
+DECL_TEMP_SPEC
+int DataTypeInfo< complex<r_8> >::getTypeId() { return(12); }
+
 
 
@@ -115 +136 @@
 #ifdef __CXX_PRAGMA_TEMPLATES__
 #pragma define_template DataTypeInfo<uint_1>
+#pragma define_template DataTypeInfo<int_1>
 #pragma define_template DataTypeInfo<uint_2>
 #pragma define_template DataTypeInfo<int_2>
@@ -130 +152 @@
 namespace SOPHYA {
 template class DataTypeInfo<uint_1>;
+template class DataTypeInfo<int_1>;
 template class DataTypeInfo<uint_2>;
 template class DataTypeInfo<int_2>;