Menu
▾
▴
csp-commits — Mailing list for CVS commit messages.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(140) |
Feb
(98) |
Mar
(152) |
Apr
(104) |
May
(71) |
Jun
(94) |
Jul
(169) |
Aug
(83) |
Sep
(47) |
Oct
(134) |
Nov
(7) |
Dec
(20) |
| 2004 |
Jan
(41) |
Feb
(14) |
Mar
(42) |
Apr
(47) |
May
(68) |
Jun
(143) |
Jul
(65) |
Aug
(29) |
Sep
(40) |
Oct
(34) |
Nov
(33) |
Dec
(97) |
| 2005 |
Jan
(29) |
Feb
(30) |
Mar
(9) |
Apr
(37) |
May
(13) |
Jun
(31) |
Jul
(22) |
Aug
(23) |
Sep
|
Oct
(37) |
Nov
(34) |
Dec
(117) |
| 2006 |
Jan
(48) |
Feb
(6) |
Mar
(2) |
Apr
(71) |
May
(10) |
Jun
(16) |
Jul
(7) |
Aug
(1) |
Sep
(14) |
Oct
(17) |
Nov
(25) |
Dec
(26) |
| 2007 |
Jan
(8) |
Feb
(2) |
Mar
(7) |
Apr
(26) |
May
|
Jun
(12) |
Jul
(30) |
Aug
(14) |
Sep
(9) |
Oct
(4) |
Nov
(7) |
Dec
(6) |
| 2008 |
Jan
(10) |
Feb
(10) |
Mar
(6) |
Apr
(8) |
May
|
Jun
(10) |
Jul
(18) |
Aug
(15) |
Sep
(16) |
Oct
(5) |
Nov
(3) |
Dec
(10) |
| 2009 |
Jan
(11) |
Feb
(2) |
Mar
|
Apr
(15) |
May
(31) |
Jun
(18) |
Jul
(11) |
Aug
(26) |
Sep
(52) |
Oct
(17) |
Nov
(4) |
Dec
|
| 2010 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv30214
Modified Files:
Tag: simdata
CSPSim.h EventMapping.h GameScreen.h SimObject.h
SimpleConfig.h VehicleModel.h compiler.h
Log Message:
no message
Index: CSPSim.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/CSPSim.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** CSPSim.h 26 Jan 2003 23:15:55 -0000 1.1.2.1
--- CSPSim.h 2 Feb 2003 15:52:21 -0000 1.1.2.2
***************
*** 28,32 ****
#define __CSPSIM_H__
!
#include "TerrainObject.h"
--- 28,32 ----
#define __CSPSIM_H__
! #include "DynamicObject.h"
#include "TerrainObject.h"
***************
*** 36,44 ****
#include <SimData/Types.h>
-
- class DynamicObject;
class VirtualBattlefield;
class VirtualHID;
- class DynamicObject;
class BaseScreen;
class GameScreen;
--- 36,41 ----
Index: EventMapping.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/EventMapping.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** EventMapping.h 26 Jan 2003 23:15:55 -0000 1.1.2.1
--- EventMapping.h 2 Feb 2003 15:52:21 -0000 1.1.2.2
***************
*** 27,30 ****
--- 27,34 ----
#define __EVENTMAPPING_H__
+ # if defined(_MSC_VER) && (_MSC_VER <= 1200)
+ #pragma warning (disable : 4786)
+ # endif
+
#include "SDL_events.h"
#include "SDL_keysym.h"
Index: GameScreen.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/GameScreen.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** GameScreen.h 26 Jan 2003 23:15:55 -0000 1.1.2.1
--- GameScreen.h 2 Feb 2003 15:52:21 -0000 1.1.2.2
***************
*** 26,29 ****
--- 26,32 ----
#define __GAMESCREEN_H__
+ #include <SimData/Math.h>
+ #include <SimData/Vector3.h>
+
#include "BaseScreen.h"
//#include "SDL_keysym.h"
***************
*** 32,36 ****
#include "HID.h"
! #include <SimData/Vector3.h>
class VirtualBattlefield;
--- 35,39 ----
#include "HID.h"
!
class VirtualBattlefield;
***************
*** 122,127 ****
void NormalView();
! void TurnViewAboutX(double fangleMax = M_PI / 2);
! void TurnViewAboutZ(double fangleMax = M_PI);
void ScaleView();
simdata::Vector3 GetNewFixedCamPos(SimObject * const target) const;
--- 125,130 ----
void NormalView();
! void TurnViewAboutX(double fangleMax = G_PI / 2);
! void TurnViewAboutZ(double fangleMax = G_PI);
void ScaleView();
simdata::Vector3 GetNewFixedCamPos(SimObject * const target) const;
Index: SimObject.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/SimObject.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** SimObject.h 26 Jan 2003 23:15:55 -0000 1.1.2.1
--- SimObject.h 2 Feb 2003 15:52:21 -0000 1.1.2.2
***************
*** 51,59 ****
public:
BEGIN_SIMDATA_XML_VIRTUAL_INTERFACE(SimObject)
SIMDATA_XML("model", SimObject::m_Model, true)
SIMDATA_XML("army", SimObject::m_Army, true)
END_SIMDATA_XML_INTERFACE
!
SimObject();
--- 51,60 ----
public:
+
BEGIN_SIMDATA_XML_VIRTUAL_INTERFACE(SimObject)
SIMDATA_XML("model", SimObject::m_Model, true)
SIMDATA_XML("army", SimObject::m_Army, true)
END_SIMDATA_XML_INTERFACE
!
SimObject();
Index: SimpleConfig.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/SimpleConfig.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** SimpleConfig.h 26 Jan 2003 23:15:55 -0000 1.1.2.1
--- SimpleConfig.h 2 Feb 2003 15:52:22 -0000 1.1.2.2
***************
*** 33,36 ****
--- 33,41 ----
#define __SIMPLECONFIG_H__
+ # if defined(_MSC_VER) && (_MSC_VER <= 1200)
+ #pragma warning (disable : 4786)
+ # endif
+
+
#include <string>
#include <vector>
***************
*** 142,147 ****
class HashString {
public:
! bool operator()(std::string const &str) const {
! return HASH<char const *>()(str.c_str());
}
};
--- 147,153 ----
class HashString {
public:
! unsigned int operator()(std::string const &str) const {
! //bool operator()(std::string const &str) const {
! return (HASH<char const *>()(str.c_str()));
}
};
Index: VehicleModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/VehicleModel.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** VehicleModel.h 26 Jan 2003 23:15:55 -0000 1.1.2.1
--- VehicleModel.h 2 Feb 2003 15:52:22 -0000 1.1.2.2
***************
*** 85,89 ****
void pack(simdata::Packer &p) const {
! vehicle::System::pack(p);
p.pack(m_Center);
p.pack(m_Width);
--- 85,89 ----
void pack(simdata::Packer &p) const {
! System::pack(p);
p.pack(m_Center);
p.pack(m_Width);
***************
*** 92,96 ****
void unpack(simdata::UnPacker &p) {
! vehicle::System::unpack(p);
p.unpack(m_Center);
p.unpack(m_Width);
--- 92,96 ----
void unpack(simdata::UnPacker &p) {
! System::unpack(p);
p.unpack(m_Center);
p.unpack(m_Width);
***************
*** 189,198 ****
void pack(simdata::Packer &p) const {
! vehicle::Model::pack(p);
p.pack(m_HUD);
}
void unpack(simdata::UnPacker &p) {
! vehicle::Model::unpack(p);
p.unpack(m_HUD);
m_HUD->bind(this);
--- 189,198 ----
void pack(simdata::Packer &p) const {
! Model::pack(p);
p.pack(m_HUD);
}
void unpack(simdata::UnPacker &p) {
! Model::unpack(p);
p.unpack(m_HUD);
m_HUD->bind(this);
Index: compiler.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/compiler.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** compiler.h 26 Jan 2003 23:15:55 -0000 1.1.2.1
--- compiler.h 2 Feb 2003 15:52:22 -0000 1.1.2.2
***************
*** 228,232 ****
--- 228,236 ----
# define STL_STRING <string>
# define STL_STRSTREAM <strstream>
+ #if !defined(_STLP_WIN32)
# define STL_SSTREAM STL_STRSTREAM
+ #else
+ # define STL_SSTREAM <sstream>
+ #endif
# pragma warning(disable: 4786) // identifier was truncated to '255' characters
|
|
From: <de...@us...> - 2003-02-02 15:49:35
|
Update of /cvsroot/csp/APPLICATIONS/SimData/SimDataMSVC In directory sc8-pr-cvs1:/tmp/cvs-serv29142 Removed Files: SimDataMSVC.dsp SimDataMSVC.dsw Log Message: no message --- SimDataMSVC.dsp DELETED --- --- SimDataMSVC.dsw DELETED --- |
|
From: <de...@us...> - 2003-02-02 15:47:24
|
Update of /cvsroot/csp/APPLICATIONS/SimData/VisualStudio
In directory sc8-pr-cvs1:/tmp/cvs-serv28145
Added Files:
SimData.dsw SimData.dsp
Log Message:
no message
--- NEW FILE: SimData.dsw ---
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "SimData"=".\SimData.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################
--- NEW FILE: SimData.dsp ---
# Microsoft Developer Studio Project File - Name="SimData" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=SimData - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "SimData.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "SimData.mak" CFG="SimData - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "SimData - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "SimData - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "SimData - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMDATA_EXPORTS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../Include" /I "C:/Python22/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMDATA_EXPORTS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40c /d "NDEBUG"
# ADD RSC /l 0x40c /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"Release/_cSimData.dll" /libpath:"C:/Python22/libs"
!ELSEIF "$(CFG)" == "SimData - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMDATA_EXPORTS" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../Include" /I "C:/Python22/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMDATA_EXPORTS" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40c /d "_DEBUG"
# ADD RSC /l 0x40c /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo /o"Debug/SimDatad.bsc"
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"Debug/_cSimDatad.dll" /pdbtype:sept /libpath:"C:/Python22/libs"
!ENDIF
# Begin Target
# Name "SimData - Win32 Release"
# Name "SimData - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\Source\BaseType.cpp
# End Source File
# Begin Source File
SOURCE=..\Source\cSimData_wrap.cpp
# End Source File
# Begin Source File
SOURCE=..\Source\DataArchive.cpp
# End Source File
# Begin Source File
SOURCE=..\Source\Date.cpp
# End Source File
# Begin Source File
SOURCE=..\Source\Enum.cpp
# End Source File
# Begin Source File
SOURCE=..\Source\Exception.cpp
# End Source File
# Begin Source File
SOURCE=..\Source\External.cpp
# End Source File
# Begin Source File
SOURCE=..\Source\HashUtility.cpp
# End Source File
# Begin Source File
SOURCE=..\Source\InterfaceRegistry.cpp
# End Source File
# Begin Source File
SOURCE=..\Source\Interpolate.cpp
# End Source File
# Begin Source File
SOURCE=..\Source\List.cpp
# End Source File
# Begin Source File
SOURCE=..\Source\main.cpp
# End Source File
# Begin Source File
SOURCE=..\Source\Math.cpp
# End Source File
# Begin Source File
SOURCE=..\Source\Matrix3.cpp
# End Source File
# Begin Source File
SOURCE=..\Source\Object.cpp
# End Source File
# Begin Source File
SOURCE=..\Source\Pack.cpp
# End Source File
# Begin Source File
SOURCE=..\Source\Path.cpp
# End Source File
# Begin Source File
SOURCE=..\Source\Quaternion.cpp
# End Source File
# Begin Source File
SOURCE=..\Source\Random.cpp
# End Source File
# Begin Source File
SOURCE=..\Source\SimDataEntryPoint.cpp
# End Source File
# Begin Source File
SOURCE=..\Source\Spread.cpp
# End Source File
# Begin Source File
SOURCE=..\Source\TypeAdapter.cpp
# End Source File
# Begin Source File
SOURCE=..\Source\Vector3.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=..\Include\SimData\BaseType.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\DataArchive.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\Date.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\Enum.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\Exception.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\Export.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\External.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\GlibCsp.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\hash_map.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\HashUtility.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\Integer.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\InterfaceRegistry.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\InterfaceRegistry_wrap.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\Interpolate.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\List.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\Math.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\Matrix3.h
# End Source File
# Begin Source File
SOURCE="..\Include\SimData\ns-simdata.h"
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\Object.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\ObjectInterface.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\Pack.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\Path.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\Quaternion.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\Random.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\Real.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\Spread.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\String.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\TypeAdapter.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\Types.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\Vector3.h
# End Source File
# Begin Source File
SOURCE=..\Include\SimData\Vector3.inl
# End Source File
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# Begin Source File
SOURCE=..\Source\cSimData.i
!IF "$(CFG)" == "SimData - Win32 Release"
# Begin Custom Build
InputPath=..\Source\cSimData.i
InputName=cSimData
"..\Source\$(InputName)_wrap.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp $(InputPath)
# End Custom Build
!ELSEIF "$(CFG)" == "SimData - Win32 Debug"
# Begin Custom Build
InputPath=..\Source\cSimData.i
InputName=cSimData
"..\Source\$(InputName)_wrap.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp $(InputPath)
# End Custom Build
!ENDIF
# End Source File
# End Target
# End Project
|
|
From: <de...@us...> - 2003-02-02 15:46:11
|
Update of /cvsroot/csp/APPLICATIONS/SimData/VisualStudio In directory sc8-pr-cvs1:/tmp/cvs-serv27654/VisualStudio Log Message: Directory /cvsroot/csp/APPLICATIONS/SimData/VisualStudio added to the repository |
|
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 ----
|
|
From: <de...@us...> - 2003-02-02 15:36:12
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv23963
Modified Files:
BaseType.h DataArchive.h Date.h Exception.h Export.h
External.h HashUtility.h InterfaceRegistry.h Matrix3.h
Object.h Path.h Quaternion.h TypeAdapter.h Vector3.h
Log Message:
no message
Index: BaseType.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/BaseType.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BaseType.h 30 Jan 2003 22:41:02 -0000 1.3
--- BaseType.h 2 Feb 2003 15:36:08 -0000 1.4
***************
*** 30,34 ****
#include <SimData/Exception.h>
-
NAMESPACE_SIMDATA
--- 30,33 ----
Index: DataArchive.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/DataArchive.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DataArchive.h 30 Jan 2003 22:41:02 -0000 1.3
--- DataArchive.h 2 Feb 2003 15:36:09 -0000 1.4
***************
*** 82,86 ****
* @author Mark Rose <mr...@st...>
*/
! class DataArchive {
friend class PathPointerBase;
--- 82,86 ----
* @author Mark Rose <mr...@st...>
*/
! class SIMDATA_EXPORT DataArchive {
friend class PathPointerBase;
Index: Date.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Date.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Date.h 28 Jan 2003 23:26:05 -0000 1.2
--- Date.h 2 Feb 2003 15:36:09 -0000 1.3
***************
*** 135,139 ****
* implementation in GLib
*/
! class Date {
public:
typedef sint32 julian_t;
--- 135,139 ----
* implementation in GLib
*/
! class SIMDATA_EXPORT Date {
public:
typedef sint32 julian_t;
***************
*** 432,436 ****
! class Zulu {
public:
--- 432,436 ----
! class SIMDATA_EXPORT Zulu {
public:
***************
*** 517,521 ****
! class DateZulu: public Date, public Zulu {
--- 517,521 ----
! class SIMDATA_EXPORT DateZulu: public Date, public Zulu {
***************
*** 586,590 ****
* @author Mark Rose <mr...@st...>
*/
! class SimDate: public DateZulu, public BaseType {
SimTime reference;
--- 586,590 ----
* @author Mark Rose <mr...@st...>
*/
! class SIMDATA_EXPORT SimDate: public DateZulu, public BaseType {
SimTime reference;
Index: Exception.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Exception.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Exception.h 30 Jan 2003 22:41:03 -0000 1.3
--- Exception.h 2 Feb 2003 15:36:09 -0000 1.4
***************
*** 42,46 ****
* @author Mark Rose <mr...@st...>
*/
! class Exception { //: public std::runtime_error {
std::string _msg;
std::string _type;
--- 42,46 ----
* @author Mark Rose <mr...@st...>
*/
! class SIMDATA_EXPORT Exception { //: public std::runtime_error {
std::string _msg;
std::string _type;
Index: Export.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Export.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Export.h 30 Jan 2003 22:55:05 -0000 1.1
--- Export.h 2 Feb 2003 15:36:09 -0000 1.2
***************
*** 3,9 ****
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__)
- #ifdef SWIG
- # define SIMDATA_EXPORT
- #else
# ifdef SIMDATA_EXPORTS
# define SIMDATA_EXPORT __declspec(dllexport)
--- 3,6 ----
***************
*** 11,15 ****
# define SIMDATA_EXPORT __declspec(dllimport)
# endif /*SIMDATA_EXPORTS */
- #endif
#else
# define SIMDATA_EXPORT
--- 8,11 ----
Index: External.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/External.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** External.h 28 Jan 2003 23:26:06 -0000 1.2
--- External.h 2 Feb 2003 15:36:09 -0000 1.3
***************
*** 40,44 ****
* @author Mark Rose <mr...@st...>
*/
! class External: public BaseType {
static std::string toNative(const char *path);
static std::string fromNative(const char *path);
--- 40,44 ----
* @author Mark Rose <mr...@st...>
*/
! class SIMDATA_EXPORT External: public BaseType {
static std::string toNative(const char *path);
static std::string fromNative(const char *path);
Index: HashUtility.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/HashUtility.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HashUtility.h 30 Jan 2003 22:41:03 -0000 1.3
--- HashUtility.h 2 Feb 2003 15:36:09 -0000 1.4
***************
*** 31,34 ****
--- 31,35 ----
#include <string>
#include <iostream>
+
#include <SimData/Export.h>
#include <SimData/hash_map.h>
***************
*** 68,72 ****
//typedef u8 hasht;
! struct HashT {
guint32 a, b;
HashT() {
--- 69,73 ----
//typedef u8 hasht;
! struct SIMDATA_EXPORT HashT {
guint32 a, b;
HashT() {
Index: InterfaceRegistry.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/InterfaceRegistry.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** InterfaceRegistry.h 30 Jan 2003 22:41:03 -0000 1.6
--- InterfaceRegistry.h 2 Feb 2003 15:36:09 -0000 1.7
***************
*** 31,35 ****
#include <vector>
- #include <SimData/Export.h>
#include <SimData/HashUtility.h>
#include <SimData/TypeAdapter.h>
--- 31,34 ----
***************
*** 55,59 ****
* @author Mark Rose <mr...@st...>
*/
! class InterfaceProxy {
public:
InterfaceProxy() {}
--- 54,58 ----
* @author Mark Rose <mr...@st...>
*/
! class SIMDATA_EXPORT InterfaceProxy {
public:
InterfaceProxy() {}
***************
*** 171,179 ****
* The master interface registry.
*/
- #ifdef _WIN32
extern InterfaceRegistry g_InterfaceRegistry;
! #else
! extern InterfaceRegistry g_InterfaceRegistry;
! #endif
//-------------------------------------------------------
--- 170,175 ----
* The master interface registry.
*/
extern InterfaceRegistry g_InterfaceRegistry;
!
//-------------------------------------------------------
Index: Matrix3.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Matrix3.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Matrix3.h 30 Jan 2003 22:41:03 -0000 1.3
--- Matrix3.h 2 Feb 2003 15:36:09 -0000 1.4
***************
*** 33,37 ****
#include <cstdio>
- #include <SimData/Export.h>
#include <SimData/BaseType.h>
--- 33,36 ----
***************
*** 63,67 ****
* class Matrix3
*/
! class Matrix3: public BaseType
{
public:
--- 62,66 ----
* class Matrix3
*/
! class SIMDATA_EXPORT Matrix3: public BaseType
{
public:
***************
*** 117,121 ****
#ifndef SWIG
// matrix * vector [3x3 * 3x1 = 3x1]
! friend Vector3 operator*(const Matrix3& rkMatrix,
const Vector3& rkVector);
--- 116,120 ----
#ifndef SWIG
// matrix * vector [3x3 * 3x1 = 3x1]
! SIMDATA_EXPORT friend Vector3 operator*(const Matrix3& rkMatrix,
const Vector3& rkVector);
***************
*** 125,129 ****
// scalar * matrix
! friend Matrix3 operator*(double fScalar, const Matrix3& rkMatrix);
#endif // SWIG
--- 124,128 ----
// scalar * matrix
! SIMDATA_EXPORT friend Matrix3 operator*(double fScalar, const Matrix3& rkMatrix);
#endif // SWIG
Index: Object.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Object.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Object.h 30 Jan 2003 22:41:03 -0000 1.4
--- Object.h 2 Feb 2003 15:36:09 -0000 1.5
***************
*** 32,36 ****
#include <string>
- #include <SimData/Export.h>
#include <SimData/HashUtility.h>
#include <SimData/Pack.h>
--- 32,35 ----
***************
*** 107,111 ****
*/
! class Object: public BaseType {
friend class DataArchive;
public:
--- 106,110 ----
*/
! class SIMDATA_EXPORT Object: public BaseType {
friend class DataArchive;
public:
Index: Path.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Path.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Path.h 28 Jan 2003 23:26:06 -0000 1.2
--- Path.h 2 Feb 2003 15:36:09 -0000 1.3
***************
*** 65,69 ****
* @author Mark Rose <mr...@st...>
*/
! class Path: public BaseType {
protected:
ObjectID _path;
--- 65,69 ----
* @author Mark Rose <mr...@st...>
*/
! class SIMDATA_EXPORT Path: public BaseType {
protected:
ObjectID _path;
***************
*** 146,150 ****
! class PointerBase {
public:
--- 146,150 ----
! class SIMDATA_EXPORT PointerBase {
public:
***************
*** 262,266 ****
* @author Mark Rose <mr...@st...>
*/
! class PathPointerBase: public Path, public PointerBase {
public:
--- 262,266 ----
* @author Mark Rose <mr...@st...>
*/
! class SIMDATA_EXPORT PathPointerBase: public Path, public PointerBase {
public:
Index: Quaternion.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Quaternion.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Quaternion.h 30 Jan 2003 22:41:04 -0000 1.3
--- Quaternion.h 2 Feb 2003 15:36:09 -0000 1.4
***************
*** 46,50 ****
#include <iostream>
- #include <SimData/Export.h>
#include <SimData/Matrix3.h>
#include <SimData/ns-simdata.h>
--- 46,49 ----
***************
*** 59,63 ****
* @author unknown
*/
! class Quaternion
{
public:
--- 58,62 ----
* @author unknown
*/
! class SIMDATA_EXPORT Quaternion
{
public:
***************
*** 99,103 ****
}
! friend Quaternion operator* (double fScalar, const Quaternion& rkQ);
Quaternion operator- () const;
--- 98,102 ----
}
! SIMDATA_EXPORT friend Quaternion operator* (double fScalar, const Quaternion& rkQ);
Quaternion operator- () const;
***************
*** 105,110 ****
// Multiplication of a Quaternion and with a Vector, yielding a quaternion.
! friend Quaternion operator*(Quaternion q, Vector3 v);
! friend Quaternion operator*(Vector3 v, Quaternion q);
--- 104,109 ----
// Multiplication of a Quaternion and with a Vector, yielding a quaternion.
! SIMDATA_EXPORT friend Quaternion operator*(Quaternion q, Vector3 v); // const &?
! friend Quaternion operator*(Vector3 v, Quaternion q); // const &?
***************
*** 150,159 ****
static Quaternion MakeQFromEulerAngles(double x, double y, double z);
! friend std::ostream & operator<< (std::ostream & os, const Quaternion & m);
};
! Vector3 QVRotate(Quaternion q, Vector3 v);
Quaternion QRotate(Quaternion q1, Quaternion q2);
--- 149,158 ----
static Quaternion MakeQFromEulerAngles(double x, double y, double z);
! SIMDATA_EXPORT friend std::ostream & operator<< (std::ostream & os, const Quaternion & m);
};
! SIMDATA_EXPORT Vector3 QVRotate(Quaternion q, Vector3 v);
Quaternion QRotate(Quaternion q1, Quaternion q2);
Index: TypeAdapter.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/TypeAdapter.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TypeAdapter.h 30 Jan 2003 22:41:05 -0000 1.3
--- TypeAdapter.h 2 Feb 2003 15:36:09 -0000 1.4
***************
*** 35,39 ****
#include <iostream>
- #include <SimData/Export.h>
#include <SimData/Exception.h>
#include <SimData/ns-simdata.h>
--- 35,38 ----
***************
*** 70,74 ****
*/
! class TypeAdapter
{
public:
--- 69,73 ----
*/
! class SIMDATA_EXPORT TypeAdapter
{
public:
Index: Vector3.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Vector3.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Vector3.h 28 Jan 2003 23:26:06 -0000 1.2
--- Vector3.h 2 Feb 2003 15:36:09 -0000 1.3
***************
*** 51,55 ****
* operators to perform basic operations.
*/
! class Vector3: public BaseType
{
public:
--- 51,55 ----
* operators to perform basic operations.
*/
! class SIMDATA_EXPORT Vector3: public BaseType
{
public:
***************
*** 151,155 ****
#ifndef SWIG
! friend std::ostream & operator << (std::ostream & os, const Vector3& v);
#endif // SWIG
--- 151,155 ----
#ifndef SWIG
! SIMDATA_EXPORT friend std::ostream & operator << (std::ostream & os, const Vector3& v);
#endif // SWIG
|
|
From: <de...@us...> - 2003-01-30 22:55:11
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv7277
Added Files:
Export.h
Log Message:
no message
--- NEW FILE: Export.h ---
#ifndef __EXPORT_H__
#define __EXPORT_H__
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__)
#ifdef SWIG
# define SIMDATA_EXPORT
#else
# ifdef SIMDATA_EXPORTS
# define SIMDATA_EXPORT __declspec(dllexport)
# else
# define SIMDATA_EXPORT __declspec(dllimport)
# endif /*SIMDATA_EXPORTS */
#endif
#else
# define SIMDATA_EXPORT
#endif
#endif __EXPORT_H__
|
|
From: <de...@us...> - 2003-01-30 22:41:11
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv1002
Modified Files:
BaseType.h DataArchive.h Exception.h HashUtility.h
InterfaceRegistry.h Matrix3.h Object.h ObjectInterface.h
Quaternion.h TypeAdapter.h
Log Message:
no message
Index: BaseType.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/BaseType.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BaseType.h 28 Jan 2003 23:26:05 -0000 1.2
--- BaseType.h 30 Jan 2003 22:41:02 -0000 1.3
***************
*** 25,28 ****
--- 25,30 ----
#include <string>
#include <iostream>
+
+ #include <SimData/Export.h>
#include <SimData/ns-simdata.h>
#include <SimData/Exception.h>
***************
*** 43,47 ****
* @author Mark Rose <mr...@st...>
*/
! class BaseType {
public:
/**
--- 45,49 ----
* @author Mark Rose <mr...@st...>
*/
! class SIMDATA_EXPORT BaseType {
public:
/**
Index: DataArchive.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/DataArchive.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DataArchive.h 28 Jan 2003 23:26:05 -0000 1.2
--- DataArchive.h 30 Jan 2003 22:41:02 -0000 1.3
***************
*** 30,33 ****
--- 30,34 ----
#include <stdio.h>
#include <stdlib.h>
+
#include <SimData/Object.h>
#include <SimData/Path.h>
Index: Exception.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Exception.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Exception.h 28 Jan 2003 23:26:06 -0000 1.2
--- Exception.h 30 Jan 2003 22:41:03 -0000 1.3
***************
*** 29,32 ****
--- 29,34 ----
#include <string>
+
+ #include <SimData/Export.h>
#include <SimData/ns-simdata.h>
Index: HashUtility.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/HashUtility.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HashUtility.h 28 Jan 2003 23:26:06 -0000 1.2
--- HashUtility.h 30 Jan 2003 22:41:03 -0000 1.3
***************
*** 31,34 ****
--- 31,35 ----
#include <string>
#include <iostream>
+ #include <SimData/Export.h>
#include <SimData/hash_map.h>
#include <SimData/GlibCsp.h>
Index: InterfaceRegistry.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/InterfaceRegistry.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** InterfaceRegistry.h 29 Jan 2003 13:55:43 -0000 1.5
--- InterfaceRegistry.h 30 Jan 2003 22:41:03 -0000 1.6
***************
*** 31,34 ****
--- 31,35 ----
#include <vector>
+ #include <SimData/Export.h>
#include <SimData/HashUtility.h>
#include <SimData/TypeAdapter.h>
***************
*** 170,175 ****
* The master interface registry.
*/
extern InterfaceRegistry g_InterfaceRegistry;
!
//-------------------------------------------------------
--- 171,179 ----
* The master interface registry.
*/
+ #ifdef _WIN32
extern InterfaceRegistry g_InterfaceRegistry;
! #else
! extern InterfaceRegistry g_InterfaceRegistry;
! #endif
//-------------------------------------------------------
***************
*** 212,216 ****
virtual bool isVirtual() const { return true; }
! #ifdef _WIN32
#define CTOR_INIT(a, b) b
#else
--- 216,220 ----
virtual bool isVirtual() const { return true; }
! #ifdef _MSC_VER
#define CTOR_INIT(a, b) b
#else
***************
*** 273,278 ****
(*_interface)
- //CTOR_INIT(baseinterface,InterfaceProxy)(cname, chash)
- //baseinterface::InterfaceProxy(cname, chash)
//-----------------------------------------
--- 277,280 ----
***************
*** 299,307 ****
#else
#define EXTEND_SIMDATA_XML_INTERFACE(classname, basename) \
! __SIMDATA_XML_INTERFACE_0(classname, basename::basename##InterfaceProxy) \
__SIMDATA_XML_INTERFACE_1(classname) \
__SIMDATA_XML_INTERFACE_2(classname, basename::basename##InterfaceProxy, basename##InterfaceProxy)
#define EXTEND_SIMDATA_XML_VIRTUAL_INTERFACE(classname, basename) \
! __SIMDATA_XML_INTERFACE_0(classname, basename::basename##InterfaceProxy) \
__SIMDATA_XML_INTERFACE_V(classname) \
__SIMDATA_XML_INTERFACE_2(classname, basename::basename##InterfaceProxy, basename##InterfaceProxy)
--- 301,310 ----
#else
#define EXTEND_SIMDATA_XML_INTERFACE(classname, basename) \
! __SIMDATA_XML_INTERFACE_0(classname, basename::basename##InterfaceProxy) \
__SIMDATA_XML_INTERFACE_1(classname) \
__SIMDATA_XML_INTERFACE_2(classname, basename::basename##InterfaceProxy, basename##InterfaceProxy)
+
#define EXTEND_SIMDATA_XML_VIRTUAL_INTERFACE(classname, basename) \
! __SIMDATA_XML_INTERFACE_0(classname, basename::basename##InterfaceProxy) \
__SIMDATA_XML_INTERFACE_V(classname) \
__SIMDATA_XML_INTERFACE_2(classname, basename::basename##InterfaceProxy, basename##InterfaceProxy)
Index: Matrix3.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Matrix3.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Matrix3.h 28 Jan 2003 23:26:06 -0000 1.2
--- Matrix3.h 30 Jan 2003 22:41:03 -0000 1.3
***************
*** 32,35 ****
--- 32,37 ----
#include <vector>
#include <cstdio>
+
+ #include <SimData/Export.h>
#include <SimData/BaseType.h>
Index: Object.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Object.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Object.h 28 Jan 2003 23:52:28 -0000 1.3
--- Object.h 30 Jan 2003 22:41:03 -0000 1.4
***************
*** 31,34 ****
--- 31,36 ----
#include <assert.h>
#include <string>
+
+ #include <SimData/Export.h>
#include <SimData/HashUtility.h>
#include <SimData/Pack.h>
Index: ObjectInterface.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/ObjectInterface.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ObjectInterface.h 28 Jan 2003 23:30:36 -0000 1.3
--- ObjectInterface.h 30 Jan 2003 22:41:03 -0000 1.4
***************
*** 65,69 ****
*/
! #ifdef WIN32
#define __PTS_SIM__
#endif
--- 65,69 ----
*/
! #ifdef _WIN32
#define __PTS_SIM__
#endif
Index: Quaternion.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Quaternion.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Quaternion.h 28 Jan 2003 23:26:06 -0000 1.2
--- Quaternion.h 30 Jan 2003 22:41:04 -0000 1.3
***************
*** 46,49 ****
--- 46,50 ----
#include <iostream>
+ #include <SimData/Export.h>
#include <SimData/Matrix3.h>
#include <SimData/ns-simdata.h>
Index: TypeAdapter.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/TypeAdapter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TypeAdapter.h 28 Jan 2003 23:26:06 -0000 1.2
--- TypeAdapter.h 30 Jan 2003 22:41:05 -0000 1.3
***************
*** 35,38 ****
--- 35,39 ----
#include <iostream>
+ #include <SimData/Export.h>
#include <SimData/Exception.h>
#include <SimData/ns-simdata.h>
|
|
From: <de...@us...> - 2003-01-30 22:40:48
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv436
Modified Files:
Interpolate.cpp cSimData_wrap.cpp
Log Message:
no message
Index: Interpolate.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Interpolate.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Interpolate.cpp 28 Jan 2003 23:26:07 -0000 1.2
--- Interpolate.cpp 30 Jan 2003 22:40:40 -0000 1.3
***************
*** 36,40 ****
printf("loaded @ %p\n", this);
}
! } check_interpolate;
--- 36,43 ----
printf("loaded @ %p\n", this);
}
! //} check_interpolate;
! };
!
! static load_check check_interpolate;
Index: cSimData_wrap.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/cSimData_wrap.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cSimData_wrap.cpp 28 Jan 2003 23:26:08 -0000 1.2
--- cSimData_wrap.cpp 30 Jan 2003 22:40:41 -0000 1.3
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.16u-20030117-0000
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.17u-20021123-0854
*
[...2360 lines suppressed...]
+ _swigt__p_simdata__DateZulu,
+ _swigt__p_simdata__PathPointerBase,
+ _swigt__p_simdata__PointerBase,
+ _swigt__p_simdata__Spread,
+ _swigt__p_simdata__IndexError,
+ _swigt__p_simdata__EnumIndexError,
+ _swigt__p_simdata__BadByteOrder,
+ _swigt__p_simdata__Enum,
+ _swigt__p_FILE,
+ _swigt__p_SIMDATA_EXPORT,
0
};
***************
*** 22888,22891 ****
--- 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);
|
|
From: <mk...@us...> - 2003-01-29 13:55:48
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv20631
Modified Files:
InterfaceRegistry.h
Log Message:
more tweaking for win32
Index: InterfaceRegistry.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/InterfaceRegistry.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InterfaceRegistry.h 29 Jan 2003 03:52:54 -0000 1.4
--- InterfaceRegistry.h 29 Jan 2003 13:55:43 -0000 1.5
***************
*** 191,197 ****
// interface macro 0
#define __SIMDATA_XML_INTERFACE_0(classname, baseinterface) \
! class InterfaceProxy; \
! friend class InterfaceProxy; \
! class InterfaceProxy: public baseinterface \
{ \
SIMDATA(ObjectInterface)<classname> *_interface; \
--- 191,197 ----
// interface macro 0
#define __SIMDATA_XML_INTERFACE_0(classname, baseinterface) \
! class classname##InterfaceProxy; \
! friend class classname##InterfaceProxy; \
! class classname##InterfaceProxy: public baseinterface \
{ \
SIMDATA(ObjectInterface)<classname> *_interface; \
***************
*** 199,203 ****
// interface macro 1 for normal classes
! #define __SIMDATA_XML_INTERFACE_1(classname, baseinterface) \
virtual SIMDATA(Object)* createObject() const { \
SIMDATA(Object) *o = new classname; \
--- 199,203 ----
// interface macro 1 for normal classes
! #define __SIMDATA_XML_INTERFACE_1(classname) \
virtual SIMDATA(Object)* createObject() const { \
SIMDATA(Object) *o = new classname; \
***************
*** 208,212 ****
// interface macro 1 for abstract classes: no createObject
! #define __SIMDATA_XML_INTERFACE_V(classname, baseinterface) \
virtual SIMDATA(Object)* createObject() const { assert(0); return 0; } \
virtual bool isVirtual() const { return true; }
--- 208,212 ----
// interface macro 1 for abstract classes: no createObject
! #define __SIMDATA_XML_INTERFACE_V(classname) \
virtual SIMDATA(Object)* createObject() const { assert(0); return 0; } \
virtual bool isVirtual() const { return true; }
***************
*** 231,249 ****
} \
virtual void pack(SIMDATA(Object) *o, SIMDATA(Packer) &p) const { \
! baseinterface::pack(o, p); \
_interface->pack(o, p); \
} \
virtual void unpack(SIMDATA(Object) *o, SIMDATA(UnPacker) &p) const { \
! baseinterface::unpack(o, p); \
_interface->unpack(o, p); \
} \
virtual bool variableExists(const char *name) const { \
! return _interface->variableExists(name) || baseinterface::variableExists(name); \
} \
virtual bool variableRequired(const char *name) const { \
! return _interface->variableRequired(name) || baseinterface::variableRequired(name); \
} \
virtual std::vector<std::string> getVariableNames() const { \
! std::vector<std::string> s = baseinterface::getVariableNames(); \
std::vector<std::string> t = _interface->getVariableNames(); \
s.insert(s.end(), t.begin(), t.end()); \
--- 231,249 ----
} \
virtual void pack(SIMDATA(Object) *o, SIMDATA(Packer) &p) const { \
! nqbaseinterface::pack(o, p); \
_interface->pack(o, p); \
} \
virtual void unpack(SIMDATA(Object) *o, SIMDATA(UnPacker) &p) const { \
! nqbaseinterface::unpack(o, p); \
_interface->unpack(o, p); \
} \
virtual bool variableExists(const char *name) const { \
! return _interface->variableExists(name) || nqbaseinterface::variableExists(name); \
} \
virtual bool variableRequired(const char *name) const { \
! return _interface->variableRequired(name) || nqbaseinterface::variableRequired(name); \
} \
virtual std::vector<std::string> getVariableNames() const { \
! std::vector<std::string> s = nqbaseinterface::getVariableNames(); \
std::vector<std::string> t = _interface->getVariableNames(); \
s.insert(s.end(), t.begin(), t.end()); \
***************
*** 251,255 ****
} \
virtual std::vector<std::string> getRequiredNames() const { \
! std::vector<std::string> s = baseinterface::getRequiredNames(); \
std::vector<std::string> t = _interface->getRequiredNames(); \
s.insert(s.end(), t.begin(), t.end()); \
--- 251,255 ----
} \
virtual std::vector<std::string> getRequiredNames() const { \
! std::vector<std::string> s = nqbaseinterface::getRequiredNames(); \
std::vector<std::string> t = _interface->getRequiredNames(); \
s.insert(s.end(), t.begin(), t.end()); \
***************
*** 262,275 ****
s.insert(s.end(), t.begin(), t.end()); \
for (name = s.begin(); name != s.end(); name++) \
! if (baseinterface::variableExists(name->c_str())) {\
throw SIMDATA(InterfaceError)("variable \"" + *name + "\" multiply defined in interface to class " #classname " or parent interface."); \
} \
} \
! InterfaceProxy(const char * cname = #classname, SIMDATA(hasht) (*chash)() = &classname::_getClassHash): \
! CTOR_INIT(baseinterface,InterfaceProxy)(cname, chash) \
{ \
_interface = new SIMDATA(ObjectInterface)<classname>; \
(*_interface)
//baseinterface::InterfaceProxy(cname, chash)
//-----------------------------------------
--- 262,277 ----
s.insert(s.end(), t.begin(), t.end()); \
for (name = s.begin(); name != s.end(); name++) \
! if (nqbaseinterface::variableExists(name->c_str())) {\
! std::cout << "variable \"" << *name << "\" multiply defined in interface to class " #classname " or parent interface." << std::endl; \
throw SIMDATA(InterfaceError)("variable \"" + *name + "\" multiply defined in interface to class " #classname " or parent interface."); \
} \
} \
! classname##InterfaceProxy(const char * cname = #classname, SIMDATA(hasht) (*chash)() = &classname::_getClassHash): \
! baseinterface(cname, chash) \
{ \
_interface = new SIMDATA(ObjectInterface)<classname>; \
(*_interface)
+ //CTOR_INIT(baseinterface,InterfaceProxy)(cname, chash)
//baseinterface::InterfaceProxy(cname, chash)
//-----------------------------------------
***************
*** 281,289 ****
#define BEGIN_SIMDATA_XML_INTERFACE(classname) \
__SIMDATA_XML_INTERFACE_0(classname, SIMDATA(InterfaceProxy)) \
! __SIMDATA_XML_INTERFACE_1(classname, SIMDATA(InterfaceProxy)) \
__SIMDATA_XML_INTERFACE_2(classname, SIMDATA(InterfaceProxy), InterfaceProxy)
#define BEGIN_SIMDATA_XML_VIRTUAL_INTERFACE(classname) \
__SIMDATA_XML_INTERFACE_0(classname, SIMDATA(InterfaceProxy)) \
! __SIMDATA_XML_INTERFACE_V(classname, SIMDATA(InterfaceProxy)) \
__SIMDATA_XML_INTERFACE_2(classname, SIMDATA(InterfaceProxy), InterfaceProxy)
#endif
--- 283,291 ----
#define BEGIN_SIMDATA_XML_INTERFACE(classname) \
__SIMDATA_XML_INTERFACE_0(classname, SIMDATA(InterfaceProxy)) \
! __SIMDATA_XML_INTERFACE_1(classname) \
__SIMDATA_XML_INTERFACE_2(classname, SIMDATA(InterfaceProxy), InterfaceProxy)
#define BEGIN_SIMDATA_XML_VIRTUAL_INTERFACE(classname) \
__SIMDATA_XML_INTERFACE_0(classname, SIMDATA(InterfaceProxy)) \
! __SIMDATA_XML_INTERFACE_V(classname) \
__SIMDATA_XML_INTERFACE_2(classname, SIMDATA(InterfaceProxy), InterfaceProxy)
#endif
***************
*** 297,307 ****
#else
#define EXTEND_SIMDATA_XML_INTERFACE(classname, basename) \
! __SIMDATA_XML_INTERFACE_0(classname, basename::InterfaceProxy) \
! __SIMDATA_XML_INTERFACE_1(classname, basename::InterfaceProxy) \
! __SIMDATA_XML_INTERFACE_2(classname, basename::InterfaceProxy, basename::InterfaceProxy)
#define EXTEND_SIMDATA_XML_VIRTUAL_INTERFACE(classname, basename) \
! __SIMDATA_XML_INTERFACE_0(classname, basename::InterfaceProxy) \
! __SIMDATA_XML_INTERFACE_V(classname, basename::InterfaceProxy) \
! __SIMDATA_XML_INTERFACE_2(classname, basename::InterfaceProxy, basename::InterfaceProxy)
#endif
--- 299,309 ----
#else
#define EXTEND_SIMDATA_XML_INTERFACE(classname, basename) \
! __SIMDATA_XML_INTERFACE_0(classname, basename::basename##InterfaceProxy) \
! __SIMDATA_XML_INTERFACE_1(classname) \
! __SIMDATA_XML_INTERFACE_2(classname, basename::basename##InterfaceProxy, basename##InterfaceProxy)
#define EXTEND_SIMDATA_XML_VIRTUAL_INTERFACE(classname, basename) \
! __SIMDATA_XML_INTERFACE_0(classname, basename::basename##InterfaceProxy) \
! __SIMDATA_XML_INTERFACE_V(classname) \
! __SIMDATA_XML_INTERFACE_2(classname, basename::basename##InterfaceProxy, basename##InterfaceProxy)
#endif
***************
*** 329,333 ****
#define SIMDATA_REGISTER_INTERFACE(classname) \
namespace { \
! classname::InterfaceProxy __##classname##_interface; \
} /* anonymous namespace */
--- 331,335 ----
#define SIMDATA_REGISTER_INTERFACE(classname) \
namespace { \
! classname::classname##InterfaceProxy __##classname##_interface; \
} /* anonymous namespace */
|
|
From: <mk...@us...> - 2003-01-29 03:52:56
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv16523/Include/SimData
Modified Files:
InterfaceRegistry.h
Log Message:
Index: InterfaceRegistry.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/InterfaceRegistry.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InterfaceRegistry.h 29 Jan 2003 00:58:50 -0000 1.3
--- InterfaceRegistry.h 29 Jan 2003 03:52:54 -0000 1.4
***************
*** 173,177 ****
-
//-------------------------------------------------------
// macros to create an interface to a specific class.
--- 173,176 ----
***************
*** 220,224 ****
// interface macro 2
! #define __SIMDATA_XML_INTERFACE_2(classname, fqbaseinterface, baseinterface) \
virtual SIMDATA(hasht) getClassHash() const { return classname::_getClassHash(); } \
virtual const char * getClassName() const { return classname::_getClassName(); } \
--- 219,223 ----
// interface macro 2
! #define __SIMDATA_XML_INTERFACE_2(classname, baseinterface, nqbaseinterface) \
virtual SIMDATA(hasht) getClassHash() const { return classname::_getClassHash(); } \
virtual const char * getClassName() const { return classname::_getClassName(); } \
***************
*** 227,231 ****
SIMDATA(MemberAccessorBase) *p = _interface->getAccessor(name); \
if (!p) { \
! return baseinterface::getAccessor(name, cname); \
} \
return p; \
--- 226,230 ----
SIMDATA(MemberAccessorBase) *p = _interface->getAccessor(name); \
if (!p) { \
! return nqbaseinterface::getAccessor(name, cname); \
} \
return p; \
***************
*** 268,276 ****
} \
InterfaceProxy(const char * cname = #classname, SIMDATA(hasht) (*chash)() = &classname::_getClassHash): \
! CTOR_INIT(fqbaseinterface,InterfaceProxy)(cname, chash) \
{ \
_interface = new SIMDATA(ObjectInterface)<classname>; \
(*_interface)
//-----------------------------------------
--- 267,276 ----
} \
InterfaceProxy(const char * cname = #classname, SIMDATA(hasht) (*chash)() = &classname::_getClassHash): \
! CTOR_INIT(baseinterface,InterfaceProxy)(cname, chash) \
{ \
_interface = new SIMDATA(ObjectInterface)<classname>; \
(*_interface)
+ //baseinterface::InterfaceProxy(cname, chash)
//-----------------------------------------
***************
*** 299,309 ****
__SIMDATA_XML_INTERFACE_0(classname, basename::InterfaceProxy) \
__SIMDATA_XML_INTERFACE_1(classname, basename::InterfaceProxy) \
! __SIMDATA_XML_INTERFACE_2(classname, basename::InterfaceProxy, InterfaceProxy)
! //__SIMDATA_XML_INTERFACE_2(classname, basename::InterfaceProxy, basename::InterfaceProxy)
#define EXTEND_SIMDATA_XML_VIRTUAL_INTERFACE(classname, basename) \
__SIMDATA_XML_INTERFACE_0(classname, basename::InterfaceProxy) \
__SIMDATA_XML_INTERFACE_V(classname, basename::InterfaceProxy) \
! __SIMDATA_XML_INTERFACE_2(classname, basename::InterfaceProxy, InterfaceProxy)
! //__SIMDATA_XML_INTERFACE_2(classname, basename::InterfaceProxy, basename::InterfaceProxy)
#endif
--- 299,307 ----
__SIMDATA_XML_INTERFACE_0(classname, basename::InterfaceProxy) \
__SIMDATA_XML_INTERFACE_1(classname, basename::InterfaceProxy) \
! __SIMDATA_XML_INTERFACE_2(classname, basename::InterfaceProxy, basename::InterfaceProxy)
#define EXTEND_SIMDATA_XML_VIRTUAL_INTERFACE(classname, basename) \
__SIMDATA_XML_INTERFACE_0(classname, basename::InterfaceProxy) \
__SIMDATA_XML_INTERFACE_V(classname, basename::InterfaceProxy) \
! __SIMDATA_XML_INTERFACE_2(classname, basename::InterfaceProxy, basename::InterfaceProxy)
#endif
|
|
From: <mk...@us...> - 2003-01-29 00:58:54
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv28425/Include/SimData
Modified Files:
InterfaceRegistry.h
Log Message:
Index: InterfaceRegistry.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/InterfaceRegistry.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InterfaceRegistry.h 28 Jan 2003 23:26:06 -0000 1.2
--- InterfaceRegistry.h 29 Jan 2003 00:58:50 -0000 1.3
***************
*** 196,200 ****
class InterfaceProxy: public baseinterface \
{ \
! SIMDATA(ObjectInterface)<classname> *interface; \
public:
--- 196,200 ----
class InterfaceProxy: public baseinterface \
{ \
! SIMDATA(ObjectInterface)<classname> *_interface; \
public:
***************
*** 202,206 ****
#define __SIMDATA_XML_INTERFACE_1(classname, baseinterface) \
virtual SIMDATA(Object)* createObject() const { \
! Object *o = new classname; \
assert(o); \
return o; \
--- 202,206 ----
#define __SIMDATA_XML_INTERFACE_1(classname, baseinterface) \
virtual SIMDATA(Object)* createObject() const { \
! SIMDATA(Object) *o = new classname; \
assert(o); \
return o; \
***************
*** 213,225 ****
virtual bool isVirtual() const { return true; }
// interface macro 2
! #define __SIMDATA_XML_INTERFACE_2(classname, baseinterface) \
virtual SIMDATA(hasht) getClassHash() const { return classname::_getClassHash(); } \
virtual const char * getClassName() const { return classname::_getClassName(); } \
virtual SIMDATA(MemberAccessorBase) * getAccessor(const char *name, const char *cname = 0) const { \
if (!cname) cname = #classname; \
! SIMDATA(MemberAccessorBase) *p = interface->getAccessor(name); \
if (!p) { \
! return baseinterface::getAccessor(name, cname); \
} \
return p; \
--- 213,231 ----
virtual bool isVirtual() const { return true; }
+ #ifdef _WIN32
+ #define CTOR_INIT(a, b) b
+ #else
+ #define CTOR_INIT(a, b) a::b
+ #endif
+
// interface macro 2
! #define __SIMDATA_XML_INTERFACE_2(classname, fqbaseinterface, baseinterface) \
virtual SIMDATA(hasht) getClassHash() const { return classname::_getClassHash(); } \
virtual const char * getClassName() const { return classname::_getClassName(); } \
virtual SIMDATA(MemberAccessorBase) * getAccessor(const char *name, const char *cname = 0) const { \
if (!cname) cname = #classname; \
! SIMDATA(MemberAccessorBase) *p = _interface->getAccessor(name); \
if (!p) { \
! return baseinterface::getAccessor(name, cname); \
} \
return p; \
***************
*** 227,245 ****
virtual void pack(SIMDATA(Object) *o, SIMDATA(Packer) &p) const { \
baseinterface::pack(o, p); \
! interface->pack(o, p); \
} \
virtual void unpack(SIMDATA(Object) *o, SIMDATA(UnPacker) &p) const { \
baseinterface::unpack(o, p); \
! interface->unpack(o, p); \
} \
virtual bool variableExists(const char *name) const { \
! return interface->variableExists(name) || baseinterface::variableExists(name); \
} \
virtual bool variableRequired(const char *name) const { \
! return interface->variableRequired(name) || baseinterface::variableRequired(name); \
} \
virtual std::vector<std::string> getVariableNames() const { \
std::vector<std::string> s = baseinterface::getVariableNames(); \
! std::vector<std::string> t = interface->getVariableNames(); \
s.insert(s.end(), t.begin(), t.end()); \
return s; \
--- 233,251 ----
virtual void pack(SIMDATA(Object) *o, SIMDATA(Packer) &p) const { \
baseinterface::pack(o, p); \
! _interface->pack(o, p); \
} \
virtual void unpack(SIMDATA(Object) *o, SIMDATA(UnPacker) &p) const { \
baseinterface::unpack(o, p); \
! _interface->unpack(o, p); \
} \
virtual bool variableExists(const char *name) const { \
! return _interface->variableExists(name) || baseinterface::variableExists(name); \
} \
virtual bool variableRequired(const char *name) const { \
! return _interface->variableRequired(name) || baseinterface::variableRequired(name); \
} \
virtual std::vector<std::string> getVariableNames() const { \
std::vector<std::string> s = baseinterface::getVariableNames(); \
! std::vector<std::string> t = _interface->getVariableNames(); \
s.insert(s.end(), t.begin(), t.end()); \
return s; \
***************
*** 247,251 ****
virtual std::vector<std::string> getRequiredNames() const { \
std::vector<std::string> s = baseinterface::getRequiredNames(); \
! std::vector<std::string> t = interface->getRequiredNames(); \
s.insert(s.end(), t.begin(), t.end()); \
return s; \
--- 253,257 ----
virtual std::vector<std::string> getRequiredNames() const { \
std::vector<std::string> s = baseinterface::getRequiredNames(); \
! std::vector<std::string> t = _interface->getRequiredNames(); \
s.insert(s.end(), t.begin(), t.end()); \
return s; \
***************
*** 253,258 ****
void checkDuplicates() const throw(SIMDATA(InterfaceError)) { \
std::vector<std::string>::const_iterator name; \
! std::vector<std::string> s = interface->getVariableNames(); \
! std::vector<std::string> t = interface->getRequiredNames(); \
s.insert(s.end(), t.begin(), t.end()); \
for (name = s.begin(); name != s.end(); name++) \
--- 259,264 ----
void checkDuplicates() const throw(SIMDATA(InterfaceError)) { \
std::vector<std::string>::const_iterator name; \
! std::vector<std::string> s = _interface->getVariableNames(); \
! std::vector<std::string> t = _interface->getRequiredNames(); \
s.insert(s.end(), t.begin(), t.end()); \
for (name = s.begin(); name != s.end(); name++) \
***************
*** 262,269 ****
} \
InterfaceProxy(const char * cname = #classname, SIMDATA(hasht) (*chash)() = &classname::_getClassHash): \
! baseinterface::InterfaceProxy(cname, chash) \
{ \
! interface = new SIMDATA(ObjectInterface)<classname>; \
! (*interface)
//-----------------------------------------
--- 268,275 ----
} \
InterfaceProxy(const char * cname = #classname, SIMDATA(hasht) (*chash)() = &classname::_getClassHash): \
! CTOR_INIT(fqbaseinterface,InterfaceProxy)(cname, chash) \
{ \
! _interface = new SIMDATA(ObjectInterface)<classname>; \
! (*_interface)
//-----------------------------------------
***************
*** 274,284 ****
#else
#define BEGIN_SIMDATA_XML_INTERFACE(classname) \
! __SIMDATA_XML_INTERFACE_0(classname, ::SIMDATA(InterfaceProxy)) \
! __SIMDATA_XML_INTERFACE_1(classname, ::SIMDATA(InterfaceProxy)) \
! __SIMDATA_XML_INTERFACE_2(classname, ::SIMDATA(InterfaceProxy))
#define BEGIN_SIMDATA_XML_VIRTUAL_INTERFACE(classname) \
! __SIMDATA_XML_INTERFACE_0(classname, ::SIMDATA(InterfaceProxy)) \
! __SIMDATA_XML_INTERFACE_V(classname, ::SIMDATA(InterfaceProxy)) \
! __SIMDATA_XML_INTERFACE_2(classname, ::SIMDATA(InterfaceProxy))
#endif
--- 280,290 ----
#else
#define BEGIN_SIMDATA_XML_INTERFACE(classname) \
! __SIMDATA_XML_INTERFACE_0(classname, SIMDATA(InterfaceProxy)) \
! __SIMDATA_XML_INTERFACE_1(classname, SIMDATA(InterfaceProxy)) \
! __SIMDATA_XML_INTERFACE_2(classname, SIMDATA(InterfaceProxy), InterfaceProxy)
#define BEGIN_SIMDATA_XML_VIRTUAL_INTERFACE(classname) \
! __SIMDATA_XML_INTERFACE_0(classname, SIMDATA(InterfaceProxy)) \
! __SIMDATA_XML_INTERFACE_V(classname, SIMDATA(InterfaceProxy)) \
! __SIMDATA_XML_INTERFACE_2(classname, SIMDATA(InterfaceProxy), InterfaceProxy)
#endif
***************
*** 293,301 ****
__SIMDATA_XML_INTERFACE_0(classname, basename::InterfaceProxy) \
__SIMDATA_XML_INTERFACE_1(classname, basename::InterfaceProxy) \
! __SIMDATA_XML_INTERFACE_2(classname, basename::InterfaceProxy)
#define EXTEND_SIMDATA_XML_VIRTUAL_INTERFACE(classname, basename) \
__SIMDATA_XML_INTERFACE_0(classname, basename::InterfaceProxy) \
__SIMDATA_XML_INTERFACE_V(classname, basename::InterfaceProxy) \
! __SIMDATA_XML_INTERFACE_2(classname, basename::InterfaceProxy)
#endif
--- 299,309 ----
__SIMDATA_XML_INTERFACE_0(classname, basename::InterfaceProxy) \
__SIMDATA_XML_INTERFACE_1(classname, basename::InterfaceProxy) \
! __SIMDATA_XML_INTERFACE_2(classname, basename::InterfaceProxy, InterfaceProxy)
! //__SIMDATA_XML_INTERFACE_2(classname, basename::InterfaceProxy, basename::InterfaceProxy)
#define EXTEND_SIMDATA_XML_VIRTUAL_INTERFACE(classname, basename) \
__SIMDATA_XML_INTERFACE_0(classname, basename::InterfaceProxy) \
__SIMDATA_XML_INTERFACE_V(classname, basename::InterfaceProxy) \
! __SIMDATA_XML_INTERFACE_2(classname, basename::InterfaceProxy, InterfaceProxy)
! //__SIMDATA_XML_INTERFACE_2(classname, basename::InterfaceProxy, basename::InterfaceProxy)
#endif
|
|
From: <mk...@us...> - 2003-01-28 23:52:32
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv3957/Include/SimData
Modified Files:
Object.h
Log Message:
ns fixup
Index: Object.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Object.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Object.h 28 Jan 2003 23:26:06 -0000 1.2
--- Object.h 28 Jan 2003 23:52:28 -0000 1.3
***************
*** 63,67 ****
__GETCLASSVERSION(major, minor)
! #define __NEW(a) virtual Object* _new() const { return new a(); }
// Macro to add standard boilerplate code to object classes. The
--- 63,67 ----
__GETCLASSVERSION(major, minor)
! #define __NEW(a) virtual SIMDATA(Object)* _new() const { return new a(); }
// Macro to add standard boilerplate code to object classes. The
|
|
From: <mk...@us...> - 2003-01-28 23:30:41
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData In directory sc8-pr-cvs1:/tmp/cvs-serv28861a/Include/SimData Modified Files: ObjectInterface.h Log Message: Index: ObjectInterface.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/ObjectInterface.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ObjectInterface.h 28 Jan 2003 23:26:06 -0000 1.2 --- ObjectInterface.h 28 Jan 2003 23:30:36 -0000 1.3 *************** *** 65,69 **** */ - #define __PTS_SIM__ #ifdef WIN32 #define __PTS_SIM__ --- 65,68 ---- |
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData In directory sc8-pr-cvs1:/tmp/cvs-serv25090/Include/SimData Added Files: BaseType.h BaseType.i DataArchive.h DataArchive.i Date.h Date.i Enum.h Enum.i Exception.h Exception.i External.h External.i GlibCsp.h HashUtility.h HashUtility.i Integer.h InterfaceRegistry.h InterfaceRegistry.i InterfaceRegistry_wrap.h Interpolate.h Interpolate.i List.h List.i Math.h Math.i Matrix3.h Matrix3.i Object.h Object.i ObjectInterface.h Pack.h Pack.i Path.h Path.i Quaternion.h Random.h Random.i Real.h Spread.h Spread.i String.h String.i TypeAdapter.h Types.h Types.i Vector3.h Vector3.i Vector3.inl cSimData.i filemap.i hash_map.h ns-simdata.h vector.i Log Message: |
|
From: <mk...@us...> - 2003-01-28 23:26:39
|
Update of /cvsroot/csp/APPLICATIONS/SimData/SimDataMSVC In directory sc8-pr-cvs1:/tmp/cvs-serv25090/SimDataMSVC Added Files: SimDataMSVC.dsp SimDataMSVC.dsw Log Message: |
|
From: <mk...@us...> - 2003-01-28 23:26:38
|
Update of /cvsroot/csp/APPLICATIONS/SimData In directory sc8-pr-cvs1:/tmp/cvs-serv25090 Added Files: COPYING Makefile README TODO Log Message: |
Update of /cvsroot/csp/APPLICATIONS/SimData/Source In directory sc8-pr-cvs1:/tmp/cvs-serv25090/Source Added Files: BaseType.cpp DataArchive.cpp Date.cpp Enum.cpp Exception.cpp External.cpp HashUtility.cpp InterfaceRegistry.cpp Interpolate.cpp List.cpp Makefile Math.cpp Matrix3.cpp Object.cpp Pack.cpp Path.cpp Quaternion.cpp Random.cpp SimData.py Spread.cpp TypeAdapter.cpp Vector3.cpp cSimData.i cSimData.py cSimData_wrap.cpp main.cpp Log Message: |
|
From: <mk...@us...> - 2003-01-28 23:26:12
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Tools/DataCompiler In directory sc8-pr-cvs1:/tmp/cvs-serv25090/Tools/DataCompiler Added Files: Compile.py Debug.py Parse.py make_simdar Log Message: |
|
From: <mk...@us...> - 2003-01-26 23:36:09
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data In directory sc8-pr-cvs1:/tmp/cvs-serv25635 Added Files: CSPSim.ini Log Message: |
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/HID In directory sc8-pr-cvs1:/tmp/cvs-serv24651 Added Files: GameScreen.hid GameScreen.map aircraft.hid aircraft.map keys.map map2hid mouse.map sample.map x36.map Log Message: |
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include In directory sc8-pr-cvs1:/tmp/cvs-serv24228 Added Files: AeroDynamics.h AircraftObject.h BaseController.h BasePhysics.h BaseScreen.h CON_consolecommands.h CSPSim.h Colorspace.h Config.h ConsoleCommands.h DirVectorDrawable.h DynamicObject.h EventMapIndex.h EventMapping.h FLCS.h GameScreen.h GlibCsp.h HID.h InputInterface.h LogStream.h LogoScreen.h MenuScreen.h Message.h OGLText.h ObjectModel.h ObjectRangeInfo.h Platform.h SimObject.h SimpleConfig.h StaticObject.h TankObject.h TerrainObject.h TerrainSymbol.h Tools.h VehicleModel.h VirtualBattlefield.h VirtualBattlefieldScene.h compiler.h debug_types.h mmgr.h nommgr.h stdinc.h Log Message: |
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source In directory sc8-pr-cvs1:/tmp/cvs-serv23911 Added Files: AeroDynamics.cpp AircraftModel.cpp AircraftObject.cpp BaseScreen.cpp CSP.i CSPSim.cpp Colorspace.cpp Config.cpp ConsoleCommands.cpp DynamicObject.cpp EventMapIndex.cpp EventMapping.cpp F16Model.cpp GameScreen.cpp HID.cpp InputInterface.cpp LogoScreen.cpp Makefile.am MenuScreen.cpp Message.cpp ObjectModel.cpp ObjectRangeInfo.cpp Platform.cpp SimObject.cpp SimpleConfig.cpp StaticObject.cpp TankObject.cpp TerrainObject.cpp Tools.cpp VirtualBattlefield.cpp base.cpp logstream.cpp main.cpp mmgr.cpp sky.cpp trees.cpp Log Message: |
|
From: <mk...@us...> - 2003-01-26 23:31:02
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim In directory sc8-pr-cvs1:/tmp/cvs-serv22915 Added Files: Makefile.am acinclude.m4 config.h.in configure.in Log Message: |
|
From: <mk...@us...> - 2003-01-26 23:19:38
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv16244
Modified Files:
Tag: simdata
aclocal.m4
Log Message:
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Attic/aclocal.m4,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** aclocal.m4 26 Jan 2003 23:15:54 -0000 1.1.2.1
--- aclocal.m4 26 Jan 2003 23:19:35 -0000 1.1.2.2
***************
*** 19,22 ****
--- 19,23 ----
dnl
dnl -OS
+ dnl
|
