[Csp-commits] APPLICATIONS/SimData/Include/SimData DataArchive.h,1.12,1.13 DataManager.h,1.5,1.6 Date.i,1.5,1.6 Enum.h,1.9,1.10 Enum.i,1.6,1.7 Export.h,1.6,1.7 External.i,1.3,1.4 Link.h,1.2,1.3 Real.i,1.3,1.4 TypeAdapter.h,1.18,1.19 Types.i,1.10,1.11 cSimData.i,1.10,1.11

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

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

Modified Files:
	DataArchive.h DataManager.h Date.i Enum.h Enum.i Export.h 
	External.i Link.h Real.i TypeAdapter.h Types.i cSimData.i 
Log Message:


Index: DataArchive.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/DataArchive.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DataArchive.h	6 Aug 2003 06:36:24 -0000	1.12
--- DataArchive.h	10 Aug 2003 17:52:07 -0000	1.13
***************
*** 27,42 ****
  #define __SIMDATA_DATAARCHIVE_H__
  
! # if defined(_MSC_VER) && (_MSC_VER <= 1200)
! #pragma warning(disable : 4786)
! # endif
! 
! #include <string>
! #include <cstdio>
! #include <cstdlib>
! 
  #include <SimData/Link.h>
  #include <SimData/Exception.h>
  #include <SimData/HashUtility.h>
  #include <SimData/Namespace.h>
  
  
--- 27,39 ----
  #define __SIMDATA_DATAARCHIVE_H__
  
! #include <SimData/Export.h>
  #include <SimData/Link.h>
  #include <SimData/Exception.h>
  #include <SimData/HashUtility.h>
  #include <SimData/Namespace.h>
+ 
+ #include <string>
+ #include <cstdio>
+ #include <cstdlib>
  
  

Index: DataManager.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/DataManager.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DataManager.h	6 Aug 2003 06:36:24 -0000	1.5
--- DataManager.h	10 Aug 2003 17:52:08 -0000	1.6
***************
*** 27,33 ****
  #define __SIMDATA_DATAMANAGER_H__
  
! # if defined(_MSC_VER) && (_MSC_VER <= 1200)
! #pragma warning(disable : 4786)
! # endif
  
  #include <string>
--- 27,34 ----
  #define __SIMDATA_DATAMANAGER_H__
  
! #include <SimData/Export.h>
! #include <SimData/Path.h>
! #include <SimData/HashUtility.h>
! #include <SimData/Namespace.h>
  
  #include <string>
***************
*** 36,42 ****
  #include <vector>
  
- #include <SimData/Path.h>
- #include <SimData/HashUtility.h>
- #include <SimData/Namespace.h>
  
  
--- 37,40 ----

Index: Date.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Date.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Date.i	6 Aug 2003 06:36:24 -0000	1.5
--- Date.i	10 Aug 2003 17:52:08 -0000	1.6
***************
*** 25,29 ****
  
  %include "std_string.i"
- //%import "SimData/Pack.i"
  
  NAMESPACE_SIMDATA
--- 25,28 ----

Index: Enum.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Enum.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Enum.h	6 Aug 2003 06:36:24 -0000	1.9
--- Enum.h	10 Aug 2003 17:52:08 -0000	1.10
***************
*** 28,34 ****
  #define __SIMDATA_ENUM_H__
  
! # if defined(_MSC_VER) && (_MSC_VER <= 1300)
! #pragma warning (disable : 4786 4251)
! # endif
  
  #include <string>
--- 28,33 ----
  #define __SIMDATA_ENUM_H__
  
! #include <SimData/Export.h>
! #include <SimData/BaseType.h>
  
  #include <string>
***************
*** 38,42 ****
  #include <map>
  
- #include <SimData/BaseType.h>
  
  
--- 37,40 ----

Index: Enum.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Enum.i,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Enum.i	6 Aug 2003 06:36:24 -0000	1.6
--- Enum.i	10 Aug 2003 17:52:08 -0000	1.7
***************
*** 37,41 ****
  #endif
  
- //%import "SimData/Pack.i"
  //%ignore eqstring;
  //%ignore hashstring;
--- 37,40 ----

Index: Export.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Export.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Export.h	6 Aug 2003 06:36:24 -0000	1.6
--- Export.h	10 Aug 2003 17:52:08 -0000	1.7
***************
*** 39,42 ****
--- 39,47 ----
  #endif
  
+ # if defined(_MSC_VER) && (_MSC_VER <= 1310)
+ #pragma warning (disable : 4786 4251)
+ # endif
+ 
+ 
  #endif // __SIMDATA_EXPORT_H__
  

Index: External.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/External.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** External.i	23 Jul 2003 05:07:50 -0000	1.3
--- External.i	10 Aug 2003 17:52:08 -0000	1.4
***************
*** 25,31 ****
  
  %include "std_string.i"
- //%import "SimData/Pack.i"
  
  %rename(__repr__) SIMDATA(External)::asString() const;
  
  %include "SimData/External.h"
--- 25,31 ----
  
  %include "std_string.i"
  
  %rename(__repr__) SIMDATA(External)::asString() const;
  
  %include "SimData/External.h"
+ 

Index: Link.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Link.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Link.h	6 Aug 2003 06:36:24 -0000	1.2
--- Link.h	10 Aug 2003 17:52:08 -0000	1.3
***************
*** 35,48 ****
  
  
! #if defined(_MSC_VER) && (_MSC_VER <= 1300)
! #include <cassert>
! #endif
  
  #include <string>
  
- 
- 
- #include <SimData/Path.h>
- #include <SimData/Object.h>
  
  
--- 35,45 ----
  
  
! #include <SimData/Export.h>
! #include <SimData/Path.h>
! #include <SimData/Object.h>
  
  #include <string>
+ #include <cassert>
  
  
  

Index: Real.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Real.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Real.i	6 Aug 2003 06:36:24 -0000	1.3
--- Real.i	10 Aug 2003 17:52:08 -0000	1.4
***************
*** 25,29 ****
  
  %include "std_string.i"
- //%import "SimData/Pack.i"
  
  %include "SimData/Namespace.h"
--- 25,28 ----

Index: TypeAdapter.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/TypeAdapter.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** TypeAdapter.h	6 Aug 2003 06:36:24 -0000	1.18
--- TypeAdapter.h	10 Aug 2003 17:52:08 -0000	1.19
***************
*** 29,38 ****
  
  #if defined(_MSC_VER) && (_MSC_VER <= 1300)
! #pragma warning (disable : 4290 4786)
  #endif
  
! #include <string>
! #include <iostream>
! 
  #include <SimData/Exception.h>
  #include <SimData/Namespace.h>
--- 29,36 ----
  
  #if defined(_MSC_VER) && (_MSC_VER <= 1300)
! #pragma warning (disable : 4290)
  #endif
  
! #include <SimData/Export.h>
  #include <SimData/Exception.h>
  #include <SimData/Namespace.h>
***************
*** 42,45 ****
--- 40,46 ----
  #include <SimData/Types.h>
  #include <SimData/PTS.h>
+ 
+ #include <string>
+ #include <iostream>
  
  

Index: Types.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Types.i,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Types.i	6 Aug 2003 06:36:24 -0000	1.10
--- Types.i	10 Aug 2003 17:52:08 -0000	1.11
***************
*** 34,37 ****
--- 34,38 ----
  %include "SimData/Object.i"
  %include "SimData/Pack.i"
+ //%include "SimData/Archive.i"
  %include "SimData/Path.i"
  %include "SimData/Link.i"

Index: cSimData.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/cSimData.i,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** cSimData.i	6 Aug 2003 06:36:25 -0000	1.10
--- cSimData.i	10 Aug 2003 17:52:08 -0000	1.11
***************
*** 67,74 ****
          } catch (SIMDATA(Exception) e) {
  		printf("SWIG: caught a SimData Exception\n");
! 		e.details();
  		return NULL;
          } catch (...) {
          	printf("SWIG: passing C++ exception back\n");
          	return NULL;
      	}
--- 67,76 ----
          } catch (SIMDATA(Exception) e) {
  		printf("SWIG: caught a SimData Exception\n");
! 		//e.details();
! 		PyErr_SetString(PyExc_RuntimeError, e.getError().c_str());
  		return NULL;
          } catch (...) {
          	printf("SWIG: passing C++ exception back\n");
+ 		PyErr_SetString(PyExc_RuntimeError, "Unknownn C++ exception");
          	return NULL;
      	}