[Csp-commits] APPLICATIONS/SimData/Include/SimData DataArchive.i,1.6,1.7

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29966

Modified Files:
	DataArchive.i 
Log Message:
see CHANGES.current

Index: DataArchive.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/DataArchive.i,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DataArchive.i	1 Feb 2004 12:06:44 -0000	1.6
--- DataArchive.i	30 Mar 2004 10:34:55 -0000	1.7
***************
*** 26,54 ****
  
  
! %import "SimData/Exception.i"
  
  //typedef  unsigned long long  hasht;   /* unsigned 8-byte type */
! //typedef  int		     int32;
  
  namespace std {
! 	%template(vector_hasht) vector<SIMDATA(hasht)>;
  }
  
  %exception SIMDATA(DataArchive) {
! 	try {
! 		$function
! 	} catch (SIMDATA(IndexError) e) {
! 		e.details();
! 		SWIG_exception(SWIG_IndexError, "Path not found");
! 	} catch (SIMDATA(ObjectMismatch) e) {
! 		e.details();
! 		SWIG_exception(SWIG_TypeError, "Object Mismatch");
! 	} catch (SIMDATA(BadMagic) e) {
! 		e.details();
! 		SWIG_exception(SWIG_IOError, "Bad Magic");
! 	} catch (SIMDATA(BadByteOrder) e) {
! 		e.details();
! 		SWIG_exception(SWIG_IOError, "Incorrect Byte Order");
! 	}
  }
  
--- 26,54 ----
  
  
! %import "SimData/ExceptionBase.i"
  
  //typedef  unsigned long long  hasht;   /* unsigned 8-byte type */
! //typedef  int           int32;
  
  namespace std {
!     %template(vector_hasht) vector<SIMDATA(hasht)>;
  }
  
  %exception SIMDATA(DataArchive) {
!     try {
!         $function
!     } catch (SIMDATA(IndexError) e) {
!         e.details();
!         SWIG_exception(SWIG_IndexError, "Path not found");
!     } catch (SIMDATA(ObjectMismatch) e) {
!         e.details();
!         SWIG_exception(SWIG_TypeError, "Object Mismatch");
!     } catch (SIMDATA(BadMagic) e) {
!         e.details();
!         SWIG_exception(SWIG_IOError, "Bad Magic");
!     } catch (SIMDATA(BadByteOrder) e) {
!         e.details();
!         SWIG_exception(SWIG_IOError, "Incorrect Byte Order");
!     }
  }
  
***************
*** 57,62 ****
  
  %typemap(out) FP {
! 	$result = PyFile_FromFile($1.f, const_cast<char*>($1.name.c_str()), 
! 					const_cast<char*>($1.mode.c_str()), 0);
  }
  
--- 57,62 ----
  
  %typemap(out) FP {
!     $result = PyFile_FromFile($1.f, const_cast<char*>($1.name.c_str()), 
!                     const_cast<char*>($1.mode.c_str()), 0);
  }
  
***************
*** 64,66 ****
  
  %exception;
- 
--- 64,65 ----