[Csp-commits] APPLICATIONS/SimData/Include/SimData BaseType.h,1.4,1.5 DataArchive.h,1.5,1.6 Date.h,1.3,1.4 Exception.h,1.4,1.5 ObjectInterface.h,1.4,1.5 Path.h,1.4,1.5 TypeAdapter.h,1.4,1.5

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv9852/Include/SimData

Modified Files:
	BaseType.h DataArchive.h Date.h Exception.h ObjectInterface.h 
	Path.h TypeAdapter.h 
Log Message:
mostly changes to exception declarations

Index: BaseType.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/BaseType.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BaseType.h	2 Feb 2003 15:36:08 -0000	1.4
--- BaseType.h	19 Feb 2003 11:14:31 -0000	1.5
***************
*** 36,40 ****
  
  
! EXCEPTION(ParseException)
  
  
--- 36,40 ----
  
  
! SIMDATA_EXCEPTION(ParseException)
  
  

Index: DataArchive.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/DataArchive.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DataArchive.h	3 Feb 2003 19:10:39 -0000	1.5
--- DataArchive.h	19 Feb 2003 11:14:33 -0000	1.6
***************
*** 46,71 ****
  
  // exceptions:
! class BadMagic: public Exception { 
! 	public: BadMagic(const char* msg): 
! 		Exception("BadMagic", msg) {}
! };
! class BadByteOrder: public Exception {
! 	public: BadByteOrder(const char* msg): 
! 		Exception("BadByteOrder", msg) {}
! };
! class CorruptArchive: public Exception {
! 	public: CorruptArchive(const char* msg): 
! 		Exception("CorruptArchive", msg) {}
! };
! class IndexError: public Exception {
! 	public: IndexError(const char* msg): 
! 		Exception("IndexError", msg) {}
! };
! class ObjectMismatch: public Exception {
! 	public: ObjectMismatch(const char* msg): 
! 		Exception("ObjectMismatch", msg) {}
! };
! 
! EXCEPTION(IOError)
  
  	// was nested in DataArchive
--- 46,55 ----
  
  // exceptions:
! SIMDATA_EXCEPTION(BadMagic)
! SIMDATA_EXCEPTION(BadByteOrder)
! SIMDATA_EXCEPTION(CorruptArchive)
! SIMDATA_EXCEPTION(IndexError)
! SIMDATA_EXCEPTION(ObjectMismatch)
! SIMDATA_EXCEPTION(IOError)
  
  	// was nested in DataArchive

Index: Date.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Date.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Date.h	2 Feb 2003 15:36:09 -0000	1.3
--- Date.h	19 Feb 2003 11:14:33 -0000	1.4
***************
*** 59,62 ****
--- 59,63 ----
  
  #include <SimData/Pack.h>
+ #include <SimData/Exception.h>
  
  
***************
*** 126,130 ****
   * detected.
   */
! class InvalidDate {};
  
  /**
--- 127,131 ----
   * detected.
   */
! SIMDATA_EXCEPTION(InvalidDate);
  
  /**

Index: Exception.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Exception.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Exception.h	2 Feb 2003 15:36:09 -0000	1.4
--- Exception.h	19 Feb 2003 11:14:33 -0000	1.5
***************
*** 57,61 ****
  };
  
! #define EXCEPTION(a)	\
  class a: public Exception { \
  public: \
--- 57,61 ----
  };
  
! #define SIMDATA_EXCEPTION(a)	\
  class a: public Exception { \
  public: \
***************
*** 69,73 ****
   * @author Mark Rose <mr...@st...>
   */
! class PythonException {};
  
  
--- 69,74 ----
   * @author Mark Rose <mr...@st...>
   */
! SIMDATA_EXCEPTION(PythonException);
! //class PythonException {};
  
  

Index: ObjectInterface.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/ObjectInterface.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ObjectInterface.h	30 Jan 2003 22:41:03 -0000	1.4
--- ObjectInterface.h	19 Feb 2003 11:14:33 -0000	1.5
***************
*** 44,48 ****
  
  
! EXCEPTION(InterfaceError)
  
  
--- 44,48 ----
  
  
! SIMDATA_EXCEPTION(InterfaceError)
  
  

Index: Path.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Path.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Path.h	3 Feb 2003 19:10:52 -0000	1.4
--- Path.h	19 Feb 2003 11:14:33 -0000	1.5
***************
*** 52,56 ****
  
  
! EXCEPTION(ObjectTypeMismatch)
  
  
--- 52,56 ----
  
  
! SIMDATA_EXCEPTION(ObjectTypeMismatch)
  
  

Index: TypeAdapter.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/TypeAdapter.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TypeAdapter.h	2 Feb 2003 15:36:09 -0000	1.4
--- TypeAdapter.h	19 Feb 2003 11:14:33 -0000	1.5
***************
*** 55,59 ****
  
  
! EXCEPTION(TypeMismatch)
  
  	
--- 55,59 ----
  
  
! SIMDATA_EXCEPTION(TypeMismatch)