Menu
▾
▴
[Csp-commits] APPLICATIONS/SimData/Source DataArchive.cpp,1.2,1.3 InterfaceRegistry.cpp,1.2,1.3 Interpolate.cpp,1.3,1.4 cSimData.i,1.2,1.3 cSimData_wrap.cpp,1.3,1.4
|
From: <de...@us...> - 2003-02-02 15:40:38
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv25040
Modified Files:
DataArchive.cpp InterfaceRegistry.cpp Interpolate.cpp
cSimData.i cSimData_wrap.cpp
Log Message:
no message
Index: DataArchive.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/DataArchive.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DataArchive.cpp 28 Jan 2003 23:26:07 -0000 1.2
--- DataArchive.cpp 2 Feb 2003 15:40:34 -0000 1.3
***************
*** 161,164 ****
--- 161,165 ----
}
+
void DataArchive::addObject(Object& a, const char* path) {
if (!is_read && !closed) {
***************
*** 167,171 ****
a.pack(p);
int length = p.getCount();
! std::cerr << "added " << path << " (" << length << " bytes) [" << hash_string(path) << "]" << std::endl;
_addEntry(offset, length, a.getClassHash(), path);
}
--- 168,172 ----
a.pack(p);
int length = p.getCount();
! std::cerr << path << " (" << length << " bytes) [" << hash_string(path) << "]" << std::endl;
_addEntry(offset, length, a.getClassHash(), path);
}
Index: InterfaceRegistry.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/InterfaceRegistry.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InterfaceRegistry.cpp 28 Jan 2003 23:26:07 -0000 1.2
--- InterfaceRegistry.cpp 2 Feb 2003 15:40:34 -0000 1.3
***************
*** 24,27 ****
--- 24,28 ----
*/
+
#include <string>
#include <vector>
***************
*** 52,57 ****
--- 53,70 ----
* The master interface registry.
*/
+ /*
+ #ifdef _WIN32
+ #pragma comment(linker, "/SECTION:.shared,RWS")
+ #pragma data_seg(".shared")
+ #endif
+ */
+
InterfaceRegistry g_InterfaceRegistry;
+ /*
+ #ifdef _WIN32
+ #pragma data_seg()
+ #endif
+ */
InterfaceProxy::InterfaceProxy(const char *cname, hasht (*chash)())
Index: Interpolate.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Interpolate.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Interpolate.cpp 30 Jan 2003 22:40:40 -0000 1.3
--- Interpolate.cpp 2 Feb 2003 15:40:34 -0000 1.4
***************
*** 36,43 ****
printf("loaded @ %p\n", this);
}
! //} check_interpolate;
! };
! static load_check check_interpolate;
--- 36,42 ----
printf("loaded @ %p\n", this);
}
! } check_interpolate;
! //static load_check check_interpolate;
Index: cSimData.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/cSimData.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cSimData.i 28 Jan 2003 23:26:07 -0000 1.2
--- cSimData.i 2 Feb 2003 15:40:34 -0000 1.3
***************
*** 14,26 ****
%include "SimData/ns-simdata.h"
!
%feature("polymorphic") SIMDATA(InterfaceProxy);
%feature("polymorphic") SIMDATA(Object);
%feature("polymorphic:except") {
! if ($error != NULL) {
! printf("got a python exception\n");
! throw SIMDATA(PythonException)();
! }
}
--- 14,26 ----
%include "SimData/ns-simdata.h"
! %include "SimData/Export.h"
%feature("polymorphic") SIMDATA(InterfaceProxy);
%feature("polymorphic") SIMDATA(Object);
%feature("polymorphic:except") {
! if ($error != NULL) {
! printf("got a python exception\n");
! throw SIMDATA(PythonException)();
! }
}
***************
*** 31,42 ****
%exception {
try {
! $action
} catch (SIMDATA(PythonException) &e) {
! printf("SWIG: passing Python exception back\n");
! return NULL;
} catch (...) {
! printf("SWIG: passing C++ exception back\n");
! return NULL;
! }
}
--- 31,46 ----
%exception {
try {
! $action
} catch (SIMDATA(PythonException) &e) {
! printf("SWIG: passing Python exception back\n");
! return NULL;
! } 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;
! }
}
***************
*** 44,48 ****
%include "SimData/InterfaceRegistry.i"
%exception;
-
-
-
--- 48,49 ----
Index: cSimData_wrap.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/cSimData_wrap.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** cSimData_wrap.cpp 30 Jan 2003 22:40:41 -0000 1.3
--- cSimData_wrap.cpp 2 Feb 2003 15:40:34 -0000 1.4
***************
*** 646,724 ****
/* -------- TYPES TABLE (BEGIN) -------- */
! #define SWIGTYPE_p_simdata__Packer swig_types[0]
! #define SWIGTYPE_p_simdata__External swig_types[1]
! #define SWIGTYPE_p_simdata__InterfaceRegistry swig_types[2]
! #define SWIGTYPE_p_std__vectorTsimdata__Enum_t swig_types[3]
! #define SWIGTYPE_p_simdata__ListTsimdata__Spread_t swig_types[4]
! #define SWIGTYPE_p_std__vectorTsimdata__Spread_t swig_types[5]
! #define SWIGTYPE_p_simdata__Enumeration swig_types[6]
! #define SWIGTYPE_p_simdata__ListTsimdata__Path_t swig_types[7]
[...1369 lines suppressed...]
+ _swigt__p_simdata__BaseType,
+ _swigt__p_simdata__ListTsimdata__Curve_t,
+ _swigt__p_simdata__ListTsimdata__Table_t,
+ _swigt__p_simdata__IOError,
_swigt__p_std__vectorTsimdata__InterfaceProxy_p_t,
! _swigt__p_simdata__InterpolatedData,
! _swigt__p_simdata__SimDate,
_swigt__p_std__vectorTstd__string_t,
! _swigt__p_simdata__Matrix3,
_swigt__p_simdata__InterfaceProxy,
0
};
***************
*** 23203,23207 ****
PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
- SWIG_addvarlink(SWIG_globals,(char*)"BaseType",_wrap_BaseType_get, _wrap_BaseType_set);
SWIG_addvarlink(SWIG_globals,(char*)"Vector3_ZERO",_wrap_Vector3_ZERO_get, _wrap_Vector3_ZERO_set);
SWIG_addvarlink(SWIG_globals,(char*)"Vector3_XAXIS",_wrap_Vector3_XAXIS_get, _wrap_Vector3_XAXIS_set);
--- 23450,23453 ----
|
