Changeset 1967 in Sophya for trunk/SophyaLib/BaseTools

Timestamp:

Apr 26, 2002, 6:48:22 PM (23 years ago)

Author:

ansari

Message:

Ajout throw TypeMismatchExc ds PPersist_X::SetDataObj() ds les differents classes handler PPersist, a place du return simple, lorsque le type d'objet n'etait pas bon ... Reza 26/4/2002

Location:

trunk/SophyaLib/BaseTools

Files:

• fiondblock.cc (modified) (2 diffs)
• objfio.h (modified) (1 diff)
• sversion.h (modified) (1 diff)

trunk/SophyaLib/BaseTools/fiondblock.cc

@@ -9 +9 @@
 #include "pexceptions.h"
 #include "fiondblock.h"
+#include "datatype.h"
+#include <typeinfo>
 
 ////////////////////////////////////////////////////////////////
@@ -71 +73 @@
 {
 NDataBlock<T> * po = dynamic_cast< NDataBlock<T> * >(&o);
-if (po == NULL) throw TypeMismatchExc("FIO_NDataBlock<T>::SetDataObj() - Type Mismatch Error");
+if (po == NULL) {
+  char buff[160];
+  sprintf(buff,"FIO_NDataBlock<T><%s>::SetDataObj(%s) - Object type  error ! ",
+          DataTypeInfo<T>::getTypeName().c_str(), typeid(o).name());
+  throw TypeMismatchExc(PExcLongMessage(buff));    
+}
 if (ownobj && dobj) delete dobj;
 dobj = po; ownobj = false;

trunk/SophyaLib/BaseTools/objfio.h

@@ -27 +27 @@
   virtual   AnyDataObj* DataObj() { return(dobj); }
   virtual   void        SetDataObj(AnyDataObj & o) 
-          {  T * po = dynamic_cast< T * >(& o); if (po == NULL) return;
-          if (ownobj && dobj) delete dobj;  dobj = po; ownobj = false; }    
-
+  {  
+    T * po = dynamic_cast< T * >(& o); 
+    if (po == NULL)  {
+      char buff[160];
+      sprintf(buff,"ObjFileIO<T>::SetDataObj(%s) - Object type  error ! ",
+              typeid(o).name());
+      throw TypeMismatchExc(PExcLongMessage(buff));    
+    }
+    if (ownobj && dobj) delete dobj;  dobj = po; ownobj = false; 
+  }    
+  
   inline operator T() { return(*dobj); }
 

trunk/SophyaLib/BaseTools/sversion.h

@@ -3 +3 @@
 
 #define SOPHYA_VERSION   1.3
-#define SOPHYA_REVISION  55 
-#define SOPHYA_TAG       "V_Jan2002"
+#define SOPHYA_REVISION  60
+#define SOPHYA_TAG       "V_Mar2002"
 
 #endif