Removed export macro.
This commit is contained in:
parent
5bfaf54292
commit
087944d343
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -15,7 +15,6 @@
|
||||
#include <osg/Geometry>
|
||||
|
||||
#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);
|
||||
|
@ -13,7 +13,6 @@
|
||||
#include <osg/Matrix>
|
||||
#include <osg/Geometry>
|
||||
|
||||
#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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -1,12 +1,11 @@
|
||||
#ifndef IVE_EXCEPTION
|
||||
#define IVE_EXCEPTION 1
|
||||
|
||||
#include "Export.h"
|
||||
#include <string>
|
||||
|
||||
namespace ive{
|
||||
|
||||
class IVE_EXPORT Exception{
|
||||
class Exception{
|
||||
public:
|
||||
Exception(std::string error);
|
||||
~Exception();
|
||||
|
@ -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
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -6,7 +6,7 @@
|
||||
#include <iostream>
|
||||
|
||||
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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -5,7 +5,7 @@
|
||||
#include <ive/ReadWrite.h>
|
||||
|
||||
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);
|
||||
|
Loading…
Reference in New Issue
Block a user