From: <mk...@us...> - 2004-03-14 04:28:17
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6313/Include/SimData Modified Files: Interpolate.i Log.h Noise.i cSimData.i Log Message: Index: Interpolate.i =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Interpolate.i,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Interpolate.i 14 Aug 2003 12:19:12 -0000 1.6 --- Interpolate.i 14 Mar 2004 04:19:23 -0000 1.7 *************** *** 24,28 **** %} - %include "std_vector.i" #ifndef VFLOAT #define VFLOAT --- 24,27 ---- Index: Log.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Log.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Log.h 19 Oct 2003 23:53:56 -0000 1.7 --- Log.h 14 Mar 2004 04:19:23 -0000 1.8 *************** *** 54,60 **** * @return current logstream */ ! inline SIMDATA_EXPORT logstream& ! log() ! { //static logstream logstrm(std::cerr); static logstream *logstrm = 0; --- 54,58 ---- * @return current logstream */ ! inline SIMDATA_EXPORT logstream& log() { //static logstream logstrm(std::cerr); static logstream *logstrm = 0; *************** *** 72,76 **** # define SIMDATA_LOG(C,P,M) #else ! # define SIMDATA_LOG(C,P,M) simdata::log() << simdata::loglevel(C,P) << M << std::endl #endif --- 70,76 ---- # define SIMDATA_LOG(C,P,M) #else ! # define SIMDATA_LOG(C,P,M) simdata::log() << simdata::loglevel(C,P) \ ! << "(" << __FILE__ << ":" << __LINE__ << ") " \ ! << M << std::endl #endif Index: Noise.i =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Noise.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Noise.i 23 Jul 2003 05:07:50 -0000 1.2 --- Noise.i 14 Mar 2004 04:19:23 -0000 1.3 *************** *** 24,29 **** %} - %include "std_vector.i" - // HACK! #ifndef VFLOAT --- 24,27 ---- Index: cSimData.i =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/cSimData.i,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** cSimData.i 1 Feb 2004 12:06:44 -0000 1.13 --- cSimData.i 14 Mar 2004 04:19:23 -0000 1.14 *************** *** 32,35 **** --- 32,36 ---- %} + // standard includes %include "std_string.i" %include "std_vector.i" *************** *** 43,46 **** --- 44,48 ---- %include "SimData/Log.i" + // not currently used (will be directors). %feature("polymorphic") SIMDATA(InterfaceProxy); %feature("polymorphic") SIMDATA(Object); |