Menu
▾
▴
[Csp-commits] APPLICATIONS/SimData/Include/SimData BaseType.h,1.3,1.4 DataArchive.h,1.3,1.4 Date.h,1.2,1.3 Exception.h,1.3,1.4 Export.h,1.1,1.2 External.h,1.2,1.3 HashUtility.h,1.3,1.4 InterfaceRegistry.h,1.6,1.7 Matrix3.h,1.3,1.4 Object.h,1.4,1.5 Path.h,1.2,1.3 Quaternion.h,1.3,1.4 TypeAdapter.h,1.3,1.4 Vector3.h,1.2,1.3
|
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
|
