From 087944d3433da9f76cc38166e2dd92d274bb5d42 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sat, 24 May 2003 14:42:00 +0000 Subject: [PATCH] Removed export macro. --- src/osgPlugins/ive/AnimationPath.h | 2 +- src/osgPlugins/ive/AnimationPathCallback.h | 2 +- src/osgPlugins/ive/Billboard.h | 2 +- src/osgPlugins/ive/BlendFunc.h | 2 +- src/osgPlugins/ive/CullFace.h | 2 +- src/osgPlugins/ive/DataInputStream.h | 3 +- src/osgPlugins/ive/DataOutputStream.h | 3 +- src/osgPlugins/ive/DrawArrayLengths.h | 2 +- src/osgPlugins/ive/DrawArrays.h | 2 +- src/osgPlugins/ive/DrawElementsUShort.h | 2 +- src/osgPlugins/ive/Drawable.h | 2 +- src/osgPlugins/ive/Exception.h | 3 +- src/osgPlugins/ive/Export.h | 41 ------------------- src/osgPlugins/ive/Geode.h | 2 +- src/osgPlugins/ive/Geometry.h | 2 +- src/osgPlugins/ive/Group.h | 2 +- src/osgPlugins/ive/Image.h | 2 +- src/osgPlugins/ive/LOD.h | 2 +- src/osgPlugins/ive/Light.h | 2 +- src/osgPlugins/ive/LightSource.h | 2 +- src/osgPlugins/ive/Material.h | 2 +- src/osgPlugins/ive/MatrixTransform.h | 2 +- src/osgPlugins/ive/Node.h | 2 +- src/osgPlugins/ive/Object.h | 2 +- .../ive/PositionAttitudeTransform.h | 2 +- src/osgPlugins/ive/PrimitiveSet.h | 2 +- src/osgPlugins/ive/ReadWrite.h | 2 +- src/osgPlugins/ive/Sequence.h | 2 +- src/osgPlugins/ive/StateSet.h | 2 +- src/osgPlugins/ive/TexEnv.h | 2 +- src/osgPlugins/ive/TexEnvCombine.h | 2 +- src/osgPlugins/ive/TexGen.h | 2 +- src/osgPlugins/ive/Texture.h | 2 +- src/osgPlugins/ive/Texture2D.h | 2 +- src/osgPlugins/ive/TextureCubeMap.h | 2 +- src/osgPlugins/ive/Transform.h | 2 +- src/osgPlugins/ive/ViewPoint.h | 2 +- 37 files changed, 36 insertions(+), 80 deletions(-) delete mode 100644 src/osgPlugins/ive/Export.h diff --git a/src/osgPlugins/ive/AnimationPath.h b/src/osgPlugins/ive/AnimationPath.h index fa5dba806..f839ea1c7 100644 --- a/src/osgPlugins/ive/AnimationPath.h +++ b/src/osgPlugins/ive/AnimationPath.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT AnimationPath : public osg::AnimationPath, public ReadWrite { +class AnimationPath : public osg::AnimationPath, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/AnimationPathCallback.h b/src/osgPlugins/ive/AnimationPathCallback.h index 98961902b..4e34f3df5 100644 --- a/src/osgPlugins/ive/AnimationPathCallback.h +++ b/src/osgPlugins/ive/AnimationPathCallback.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT AnimationPathCallback : public osg::AnimationPathCallback, public ReadWrite { +class AnimationPathCallback : public osg::AnimationPathCallback, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Billboard.h b/src/osgPlugins/ive/Billboard.h index a57720340..0237b6ffb 100644 --- a/src/osgPlugins/ive/Billboard.h +++ b/src/osgPlugins/ive/Billboard.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT Billboard : public osg::Billboard, public ReadWrite { +class Billboard : public osg::Billboard, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/BlendFunc.h b/src/osgPlugins/ive/BlendFunc.h index 76e964ca8..9aef5f6f2 100644 --- a/src/osgPlugins/ive/BlendFunc.h +++ b/src/osgPlugins/ive/BlendFunc.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT BlendFunc : public osg::BlendFunc, public ReadWrite { +class BlendFunc : public osg::BlendFunc, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/CullFace.h b/src/osgPlugins/ive/CullFace.h index 41d6d134f..58c943b26 100644 --- a/src/osgPlugins/ive/CullFace.h +++ b/src/osgPlugins/ive/CullFace.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT CullFace : public osg::CullFace, public ReadWrite { +class CullFace : public osg::CullFace, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/DataInputStream.h b/src/osgPlugins/ive/DataInputStream.h index 896deb57e..a7ba42c5a 100644 --- a/src/osgPlugins/ive/DataInputStream.h +++ b/src/osgPlugins/ive/DataInputStream.h @@ -15,7 +15,6 @@ #include #include "DataTypeSize.h" -#include "Export.h" #include "Exception.h" @@ -25,7 +24,7 @@ namespace ive{ -class IVE_EXPORT DataInputStream{ +class DataInputStream{ public: DataInputStream(std::istream* istream); diff --git a/src/osgPlugins/ive/DataOutputStream.h b/src/osgPlugins/ive/DataOutputStream.h index 8ee29b5bb..386a08b08 100644 --- a/src/osgPlugins/ive/DataOutputStream.h +++ b/src/osgPlugins/ive/DataOutputStream.h @@ -13,7 +13,6 @@ #include #include -#include "Export.h" #include "DataTypeSize.h" #include "Exception.h" @@ -22,7 +21,7 @@ namespace ive { -class IVE_EXPORT DataOutputStream{ +class DataOutputStream{ public: DataOutputStream(std::ostream* ostream); diff --git a/src/osgPlugins/ive/DrawArrayLengths.h b/src/osgPlugins/ive/DrawArrayLengths.h index 225f3a6db..922608250 100644 --- a/src/osgPlugins/ive/DrawArrayLengths.h +++ b/src/osgPlugins/ive/DrawArrayLengths.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT DrawArrayLengths : public osg::DrawArrayLengths, public ReadWrite { +class DrawArrayLengths : public osg::DrawArrayLengths, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/DrawArrays.h b/src/osgPlugins/ive/DrawArrays.h index a94873620..4ec059cd1 100644 --- a/src/osgPlugins/ive/DrawArrays.h +++ b/src/osgPlugins/ive/DrawArrays.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT DrawArrays : public ReadWrite, public osg::DrawArrays{ +class DrawArrays : public ReadWrite, public osg::DrawArrays{ public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/DrawElementsUShort.h b/src/osgPlugins/ive/DrawElementsUShort.h index 325b912ef..e7c1a67f9 100644 --- a/src/osgPlugins/ive/DrawElementsUShort.h +++ b/src/osgPlugins/ive/DrawElementsUShort.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT DrawElementsUShort : public osg::DrawElementsUShort, public ReadWrite { +class DrawElementsUShort : public osg::DrawElementsUShort, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Drawable.h b/src/osgPlugins/ive/Drawable.h index beedd31d7..d60a66aec 100644 --- a/src/osgPlugins/ive/Drawable.h +++ b/src/osgPlugins/ive/Drawable.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT Drawable : public ReadWrite, public osg::Drawable{ +class Drawable : public ReadWrite, public osg::Drawable{ public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Exception.h b/src/osgPlugins/ive/Exception.h index 16dcf6eac..17e512ada 100644 --- a/src/osgPlugins/ive/Exception.h +++ b/src/osgPlugins/ive/Exception.h @@ -1,12 +1,11 @@ #ifndef IVE_EXCEPTION #define IVE_EXCEPTION 1 -#include "Export.h" #include namespace ive{ -class IVE_EXPORT Exception{ +class Exception{ public: Exception(std::string error); ~Exception(); diff --git a/src/osgPlugins/ive/Export.h b/src/osgPlugins/ive/Export.h deleted file mode 100644 index e0289cbfd..000000000 --- a/src/osgPlugins/ive/Export.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef IVE_EXPORT_H -#define IVE_EXPORT_H 1 - - -#if defined(_MSC_VER) - #pragma warning( disable : 4244 ) - #pragma warning( disable : 4251 ) - #pragma warning( disable : 4267 ) - #pragma warning( disable : 4275 ) - #pragma warning( disable : 4290 ) - #pragma warning( disable : 4786 ) -#endif - -#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # ifdef IVE_LIBRARY - # define IVE_EXPORT __declspec(dllexport) - # else - # define IVE_EXPORT __declspec(dllimport) - # endif /* IVE_LIBRARY */ -#else - # define IVE_EXPORT -#endif - -// set up define for whether member templates are supported by VisualStudio compilers. -#ifdef _MSC_VER -# if (_MSC_VER >= 1300) -# define __STL_MEMBER_TEMPLATES -# endif -#endif - -/* Define NULL pointer value */ - -#ifndef NULL - #ifdef __cplusplus - #define NULL 0 - #else - #define NULL ((void *)0) - #endif -#endif - -#endif diff --git a/src/osgPlugins/ive/Geode.h b/src/osgPlugins/ive/Geode.h index 51a5d7d24..5841969f7 100644 --- a/src/osgPlugins/ive/Geode.h +++ b/src/osgPlugins/ive/Geode.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT Geode : public ReadWrite, public osg::Geode{ +class Geode : public ReadWrite, public osg::Geode{ public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Geometry.h b/src/osgPlugins/ive/Geometry.h index d2fc670aa..ca88bb63a 100644 --- a/src/osgPlugins/ive/Geometry.h +++ b/src/osgPlugins/ive/Geometry.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT Geometry : public ReadWrite, public osg::Geometry{ +class Geometry : public ReadWrite, public osg::Geometry{ public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Group.h b/src/osgPlugins/ive/Group.h index fd77a4087..f2cd2117a 100644 --- a/src/osgPlugins/ive/Group.h +++ b/src/osgPlugins/ive/Group.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT Group : public osg::Group, public ReadWrite{ +class Group : public osg::Group, public ReadWrite{ public: void write(DataOutputStream* out); void read(DataInputStream* out); diff --git a/src/osgPlugins/ive/Image.h b/src/osgPlugins/ive/Image.h index e8309407b..07b8c62b5 100644 --- a/src/osgPlugins/ive/Image.h +++ b/src/osgPlugins/ive/Image.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT Image : public osg::Image, public ReadWrite { +class Image : public osg::Image, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/LOD.h b/src/osgPlugins/ive/LOD.h index 3569665a1..4917c799e 100644 --- a/src/osgPlugins/ive/LOD.h +++ b/src/osgPlugins/ive/LOD.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT LOD : public osg::LOD, public ReadWrite { +class LOD : public osg::LOD, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Light.h b/src/osgPlugins/ive/Light.h index 660a4c222..033e10708 100644 --- a/src/osgPlugins/ive/Light.h +++ b/src/osgPlugins/ive/Light.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT Light : public osg::Light, public ReadWrite { +class Light : public osg::Light, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/LightSource.h b/src/osgPlugins/ive/LightSource.h index 105bc4b3c..b03b8afb7 100644 --- a/src/osgPlugins/ive/LightSource.h +++ b/src/osgPlugins/ive/LightSource.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT LightSource : public osg::LightSource, public ReadWrite { +class LightSource : public osg::LightSource, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Material.h b/src/osgPlugins/ive/Material.h index f802af80a..341708e33 100644 --- a/src/osgPlugins/ive/Material.h +++ b/src/osgPlugins/ive/Material.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT Material : public osg::Material, public ReadWrite { +class Material : public osg::Material, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/MatrixTransform.h b/src/osgPlugins/ive/MatrixTransform.h index 380396a2c..1b59cafb8 100644 --- a/src/osgPlugins/ive/MatrixTransform.h +++ b/src/osgPlugins/ive/MatrixTransform.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT MatrixTransform : public osg::MatrixTransform, public ReadWrite { +class MatrixTransform : public osg::MatrixTransform, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Node.h b/src/osgPlugins/ive/Node.h index 5c4a10a4c..3f7b37fad 100644 --- a/src/osgPlugins/ive/Node.h +++ b/src/osgPlugins/ive/Node.h @@ -6,7 +6,7 @@ #include namespace ive{ -class IVE_EXPORT Node : public osg::Node, public ReadWrite{ +class Node : public osg::Node, public ReadWrite{ public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Object.h b/src/osgPlugins/ive/Object.h index 9f520ff70..dcde6115c 100644 --- a/src/osgPlugins/ive/Object.h +++ b/src/osgPlugins/ive/Object.h @@ -7,7 +7,7 @@ namespace ive{ -class IVE_EXPORT Object : public ReadWrite, public osg::Object{ +class Object : public ReadWrite, public osg::Object{ public: void write(DataOutputStream* out); void read(DataInputStream* out); diff --git a/src/osgPlugins/ive/PositionAttitudeTransform.h b/src/osgPlugins/ive/PositionAttitudeTransform.h index 332d9abd5..b38d31973 100644 --- a/src/osgPlugins/ive/PositionAttitudeTransform.h +++ b/src/osgPlugins/ive/PositionAttitudeTransform.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT PositionAttitudeTransform : public osg::PositionAttitudeTransform, public ReadWrite { +class PositionAttitudeTransform : public osg::PositionAttitudeTransform, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/PrimitiveSet.h b/src/osgPlugins/ive/PrimitiveSet.h index 6e4d13bd3..04202d461 100644 --- a/src/osgPlugins/ive/PrimitiveSet.h +++ b/src/osgPlugins/ive/PrimitiveSet.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT PrimitiveSet : public ReadWrite, public osg::PrimitiveSet{ +class PrimitiveSet : public ReadWrite, public osg::PrimitiveSet{ public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/ReadWrite.h b/src/osgPlugins/ive/ReadWrite.h index 1b2668bcc..370e6819b 100644 --- a/src/osgPlugins/ive/ReadWrite.h +++ b/src/osgPlugins/ive/ReadWrite.h @@ -55,7 +55,7 @@ namespace ive { // Our own classes #define IVEVIEWPOINT 0x00100001 -class IVE_EXPORT ReadWrite{ +class ReadWrite{ public: virtual void write(DataOutputStream* out) const = 0; diff --git a/src/osgPlugins/ive/Sequence.h b/src/osgPlugins/ive/Sequence.h index 4c989f5bd..61655d610 100644 --- a/src/osgPlugins/ive/Sequence.h +++ b/src/osgPlugins/ive/Sequence.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT Sequence : public osg::Sequence, public ReadWrite { +class Sequence : public osg::Sequence, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/StateSet.h b/src/osgPlugins/ive/StateSet.h index e241f65ee..204af7802 100644 --- a/src/osgPlugins/ive/StateSet.h +++ b/src/osgPlugins/ive/StateSet.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT StateSet : public ReadWrite, public osg::StateSet{ +class StateSet : public ReadWrite, public osg::StateSet{ public: void write(DataOutputStream* out); void read(DataInputStream* out); diff --git a/src/osgPlugins/ive/TexEnv.h b/src/osgPlugins/ive/TexEnv.h index d6a550a32..bf6a6ba08 100644 --- a/src/osgPlugins/ive/TexEnv.h +++ b/src/osgPlugins/ive/TexEnv.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT TexEnv : public osg::TexEnv, public ReadWrite { +class TexEnv : public osg::TexEnv, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/TexEnvCombine.h b/src/osgPlugins/ive/TexEnvCombine.h index ddbe25134..35b4576b5 100644 --- a/src/osgPlugins/ive/TexEnvCombine.h +++ b/src/osgPlugins/ive/TexEnvCombine.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT TexEnvCombine : public osg::TexEnvCombine, public ReadWrite { +class TexEnvCombine : public osg::TexEnvCombine, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/TexGen.h b/src/osgPlugins/ive/TexGen.h index 843c3487c..141989271 100644 --- a/src/osgPlugins/ive/TexGen.h +++ b/src/osgPlugins/ive/TexGen.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT TexGen : public osg::TexGen, public ReadWrite { +class TexGen : public osg::TexGen, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Texture.h b/src/osgPlugins/ive/Texture.h index 1d4d707ab..9e779aab0 100644 --- a/src/osgPlugins/ive/Texture.h +++ b/src/osgPlugins/ive/Texture.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT Texture : public osg::Texture, public ReadWrite { +class Texture : public osg::Texture, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Texture2D.h b/src/osgPlugins/ive/Texture2D.h index 07847e4d6..2047b4ac1 100644 --- a/src/osgPlugins/ive/Texture2D.h +++ b/src/osgPlugins/ive/Texture2D.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT Texture2D : public osg::Texture2D, public ReadWrite { +class Texture2D : public osg::Texture2D, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/TextureCubeMap.h b/src/osgPlugins/ive/TextureCubeMap.h index 55b8bfb1c..f58151934 100644 --- a/src/osgPlugins/ive/TextureCubeMap.h +++ b/src/osgPlugins/ive/TextureCubeMap.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT TextureCubeMap : public osg::TextureCubeMap, public ReadWrite { +class TextureCubeMap : public osg::TextureCubeMap, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Transform.h b/src/osgPlugins/ive/Transform.h index a0be671a8..b5a51ef69 100644 --- a/src/osgPlugins/ive/Transform.h +++ b/src/osgPlugins/ive/Transform.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class IVE_EXPORT Transform : public osg::Transform, public ReadWrite { +class Transform : public osg::Transform, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/ViewPoint.h b/src/osgPlugins/ive/ViewPoint.h index 67bbd4734..6d2da21b2 100644 --- a/src/osgPlugins/ive/ViewPoint.h +++ b/src/osgPlugins/ive/ViewPoint.h @@ -5,7 +5,7 @@ #include namespace ive{ -class IVE_EXPORT ViewPoint : public osgfIVE::ViewPoint, public ReadWrite { +class ViewPoint : public osgfIVE::ViewPoint, public ReadWrite { public: void write(DataOutputStream* out); void read(DataInputStream* in);