From 56e513d35372b9e34465427b8bd77d110dbdf3c9 Mon Sep 17 00:00:00 2001 From: Shon Ferguson <shonferg@users.sourceforge.net> Date: Sat, 31 Mar 2007 23:05:32 +0000 Subject: [PATCH] Wrapped operator= in #ifndef SWIG to suppress warnings. --- include/gen/AVObject.h | 7 +++++-- include/gen/BoundingBox.h | 7 +++++-- include/gen/ByteArray.h | 7 +++++-- include/gen/ControllerLink.h | 7 +++++-- include/gen/Footer.h | 7 +++++-- include/gen/FurniturePosition.h | 7 +++++-- include/gen/Header.h | 7 +++++-- include/gen/LODRange.h | 7 +++++-- include/gen/LimitedHingeDescriptor.h | 7 +++++-- include/gen/MatchGroup.h | 7 +++++-- include/gen/MipMap.h | 7 +++++-- include/gen/Morph.h | 7 +++++-- include/gen/NodeGroup.h | 7 +++++-- include/gen/OblivionColFilter.h | 7 +++++-- include/gen/OblivionSubShape.h | 7 +++++-- include/gen/Particle.h | 7 +++++-- include/gen/QuaternionXYZW.h | 7 +++++-- include/gen/RagDollDescriptor.h | 7 +++++-- include/gen/ShaderTexDesc.h | 7 +++++-- include/gen/SkinData.h | 7 +++++-- include/gen/SkinPartition.h | 7 +++++-- include/gen/SkinShape.h | 7 +++++-- include/gen/SkinShapeGroup.h | 7 +++++-- include/gen/SkinWeight.h | 7 +++++-- include/gen/Sphere.h | 7 +++++-- include/gen/StringPalette.h | 7 +++++-- include/gen/TBC.h | 7 +++++-- include/gen/TexDesc.h | 7 +++++-- include/gen/TexSource.h | 7 +++++-- include/gen/hkTriangle.h | 7 +++++-- include/obj/NiExtraData.h | 2 +- 31 files changed, 151 insertions(+), 61 deletions(-) diff --git a/include/gen/AVObject.h b/include/gen/AVObject.h index 802fdcdc..5ac74338 100644 --- a/include/gen/AVObject.h +++ b/include/gen/AVObject.h @@ -17,12 +17,15 @@ class NiAVObject; struct AVObject { /*! Default Constructor */ NIFLIB_API AVObject(); + /*! Default Destructor */ + NIFLIB_API ~AVObject(); /*! Copy Constructor */ NIFLIB_API AVObject( const AVObject & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API AVObject & operator=( const AVObject & src ); - /*! Default Destructor */ - NIFLIB_API ~AVObject(); + #endif /*! * Object name. */ diff --git a/include/gen/BoundingBox.h b/include/gen/BoundingBox.h index f8b297f0..3e5b5325 100644 --- a/include/gen/BoundingBox.h +++ b/include/gen/BoundingBox.h @@ -15,12 +15,15 @@ namespace Niflib { struct BoundingBox { /*! Default Constructor */ NIFLIB_API BoundingBox(); + /*! Default Destructor */ + NIFLIB_API ~BoundingBox(); /*! Copy Constructor */ NIFLIB_API BoundingBox( const BoundingBox & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API BoundingBox & operator=( const BoundingBox & src ); - /*! Default Destructor */ - NIFLIB_API ~BoundingBox(); + #endif /*! * Usually 1. */ diff --git a/include/gen/ByteArray.h b/include/gen/ByteArray.h index a8404f94..8ef6b002 100644 --- a/include/gen/ByteArray.h +++ b/include/gen/ByteArray.h @@ -15,12 +15,15 @@ namespace Niflib { struct ByteArray { /*! Default Constructor */ NIFLIB_API ByteArray(); + /*! Default Destructor */ + NIFLIB_API ~ByteArray(); /*! Copy Constructor */ NIFLIB_API ByteArray( const ByteArray & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API ByteArray & operator=( const ByteArray & src ); - /*! Default Destructor */ - NIFLIB_API ~ByteArray(); + #endif /*! * The number of bytes in this array */ diff --git a/include/gen/ControllerLink.h b/include/gen/ControllerLink.h index d9de126b..5fb2eaab 100644 --- a/include/gen/ControllerLink.h +++ b/include/gen/ControllerLink.h @@ -25,12 +25,15 @@ class NiStringPalette; struct ControllerLink { /*! Default Constructor */ NIFLIB_API ControllerLink(); + /*! Default Destructor */ + NIFLIB_API ~ControllerLink(); /*! Copy Constructor */ NIFLIB_API ControllerLink( const ControllerLink & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API ControllerLink & operator=( const ControllerLink & src ); - /*! Default Destructor */ - NIFLIB_API ~ControllerLink(); + #endif /*! * Name of a controllable object in another NIF file. */ diff --git a/include/gen/Footer.h b/include/gen/Footer.h index cec6ed2f..d4bcb922 100644 --- a/include/gen/Footer.h +++ b/include/gen/Footer.h @@ -20,12 +20,15 @@ class NiObject; struct Footer { /*! Default Constructor */ NIFLIB_API Footer(); + /*! Default Destructor */ + NIFLIB_API ~Footer(); /*! Copy Constructor */ NIFLIB_API Footer( const Footer & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API Footer & operator=( const Footer & src ); - /*! Default Destructor */ - NIFLIB_API ~Footer(); + #endif /*! * The number of root references. */ diff --git a/include/gen/FurniturePosition.h b/include/gen/FurniturePosition.h index e1a9e6d8..63a6940b 100644 --- a/include/gen/FurniturePosition.h +++ b/include/gen/FurniturePosition.h @@ -15,12 +15,15 @@ namespace Niflib { struct FurniturePosition { /*! Default Constructor */ NIFLIB_API FurniturePosition(); + /*! Default Destructor */ + NIFLIB_API ~FurniturePosition(); /*! Copy Constructor */ NIFLIB_API FurniturePosition( const FurniturePosition & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API FurniturePosition & operator=( const FurniturePosition & src ); - /*! Default Destructor */ - NIFLIB_API ~FurniturePosition(); + #endif /*! * Offset of furniture marker. */ diff --git a/include/gen/Header.h b/include/gen/Header.h index ad54673f..a89524aa 100644 --- a/include/gen/Header.h +++ b/include/gen/Header.h @@ -16,12 +16,15 @@ namespace Niflib { struct Header { /*! Default Constructor */ NIFLIB_API Header(); + /*! Default Destructor */ + NIFLIB_API ~Header(); /*! Copy Constructor */ NIFLIB_API Header( const Header & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API Header & operator=( const Header & src ); - /*! Default Destructor */ - NIFLIB_API ~Header(); + #endif /*! * 'NetImmerse File Format x.x.x.x' (versions <= 10.0.1.2) or 'Gamebryo * File Format x.x.x.x' (versions >= 10.1.0.0), with x.x.x.x the version diff --git a/include/gen/LODRange.h b/include/gen/LODRange.h index 3cad1c6a..799e5a51 100644 --- a/include/gen/LODRange.h +++ b/include/gen/LODRange.h @@ -15,12 +15,15 @@ namespace Niflib { struct LODRange { /*! Default Constructor */ NIFLIB_API LODRange(); + /*! Default Destructor */ + NIFLIB_API ~LODRange(); /*! Copy Constructor */ NIFLIB_API LODRange( const LODRange & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API LODRange & operator=( const LODRange & src ); - /*! Default Destructor */ - NIFLIB_API ~LODRange(); + #endif /*! * Begining of range. */ diff --git a/include/gen/LimitedHingeDescriptor.h b/include/gen/LimitedHingeDescriptor.h index cc264672..0180e02a 100644 --- a/include/gen/LimitedHingeDescriptor.h +++ b/include/gen/LimitedHingeDescriptor.h @@ -15,12 +15,15 @@ namespace Niflib { struct LimitedHingeDescriptor { /*! Default Constructor */ NIFLIB_API LimitedHingeDescriptor(); + /*! Default Destructor */ + NIFLIB_API ~LimitedHingeDescriptor(); /*! Copy Constructor */ NIFLIB_API LimitedHingeDescriptor( const LimitedHingeDescriptor & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API LimitedHingeDescriptor & operator=( const LimitedHingeDescriptor & src ); - /*! Default Destructor */ - NIFLIB_API ~LimitedHingeDescriptor(); + #endif /*! * Unknown. */ diff --git a/include/gen/MatchGroup.h b/include/gen/MatchGroup.h index cec9065c..df1bda76 100644 --- a/include/gen/MatchGroup.h +++ b/include/gen/MatchGroup.h @@ -15,12 +15,15 @@ namespace Niflib { struct MatchGroup { /*! Default Constructor */ NIFLIB_API MatchGroup(); + /*! Default Destructor */ + NIFLIB_API ~MatchGroup(); /*! Copy Constructor */ NIFLIB_API MatchGroup( const MatchGroup & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API MatchGroup & operator=( const MatchGroup & src ); - /*! Default Destructor */ - NIFLIB_API ~MatchGroup(); + #endif /*! * Number of vertices in this group. */ diff --git a/include/gen/MipMap.h b/include/gen/MipMap.h index e3f0fd62..c87b581e 100644 --- a/include/gen/MipMap.h +++ b/include/gen/MipMap.h @@ -15,12 +15,15 @@ namespace Niflib { struct MipMap { /*! Default Constructor */ NIFLIB_API MipMap(); + /*! Default Destructor */ + NIFLIB_API ~MipMap(); /*! Copy Constructor */ NIFLIB_API MipMap( const MipMap & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API MipMap & operator=( const MipMap & src ); - /*! Default Destructor */ - NIFLIB_API ~MipMap(); + #endif /*! * Width of the mipmap image. */ diff --git a/include/gen/Morph.h b/include/gen/Morph.h index e9c2c625..b11f5eaa 100644 --- a/include/gen/Morph.h +++ b/include/gen/Morph.h @@ -15,12 +15,15 @@ namespace Niflib { struct Morph { /*! Default Constructor */ NIFLIB_API Morph(); + /*! Default Destructor */ + NIFLIB_API ~Morph(); /*! Copy Constructor */ NIFLIB_API Morph( const Morph & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API Morph & operator=( const Morph & src ); - /*! Default Destructor */ - NIFLIB_API ~Morph(); + #endif /*! * Name of the frame. */ diff --git a/include/gen/NodeGroup.h b/include/gen/NodeGroup.h index df2c116c..18783394 100644 --- a/include/gen/NodeGroup.h +++ b/include/gen/NodeGroup.h @@ -17,12 +17,15 @@ class NiNode; struct NodeGroup { /*! Default Constructor */ NIFLIB_API NodeGroup(); + /*! Default Destructor */ + NIFLIB_API ~NodeGroup(); /*! Copy Constructor */ NIFLIB_API NodeGroup( const NodeGroup & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API NodeGroup & operator=( const NodeGroup & src ); - /*! Default Destructor */ - NIFLIB_API ~NodeGroup(); + #endif /*! * Number of node references that follow. */ diff --git a/include/gen/OblivionColFilter.h b/include/gen/OblivionColFilter.h index ee4d89f5..f1dcdc60 100644 --- a/include/gen/OblivionColFilter.h +++ b/include/gen/OblivionColFilter.h @@ -15,12 +15,15 @@ namespace Niflib { struct OblivionColFilter { /*! Default Constructor */ NIFLIB_API OblivionColFilter(); + /*! Default Destructor */ + NIFLIB_API ~OblivionColFilter(); /*! Copy Constructor */ NIFLIB_API OblivionColFilter( const OblivionColFilter & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API OblivionColFilter & operator=( const OblivionColFilter & src ); - /*! Default Destructor */ - NIFLIB_API ~OblivionColFilter(); + #endif /*! * Sets mesh color in Oblivion Construction Set. */ diff --git a/include/gen/OblivionSubShape.h b/include/gen/OblivionSubShape.h index c0632944..eceee478 100644 --- a/include/gen/OblivionSubShape.h +++ b/include/gen/OblivionSubShape.h @@ -15,12 +15,15 @@ namespace Niflib { struct OblivionSubShape { /*! Default Constructor */ NIFLIB_API OblivionSubShape(); + /*! Default Destructor */ + NIFLIB_API ~OblivionSubShape(); /*! Copy Constructor */ NIFLIB_API OblivionSubShape( const OblivionSubShape & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API OblivionSubShape & operator=( const OblivionSubShape & src ); - /*! Default Destructor */ - NIFLIB_API ~OblivionSubShape(); + #endif /*! * Sets mesh color in Oblivion Construction Set. */ diff --git a/include/gen/Particle.h b/include/gen/Particle.h index eebf47dd..bdcc9b6c 100644 --- a/include/gen/Particle.h +++ b/include/gen/Particle.h @@ -15,12 +15,15 @@ namespace Niflib { struct Particle { /*! Default Constructor */ NIFLIB_API Particle(); + /*! Default Destructor */ + NIFLIB_API ~Particle(); /*! Copy Constructor */ NIFLIB_API Particle( const Particle & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API Particle & operator=( const Particle & src ); - /*! Default Destructor */ - NIFLIB_API ~Particle(); + #endif /*! * Particle velocity */ diff --git a/include/gen/QuaternionXYZW.h b/include/gen/QuaternionXYZW.h index fb705ead..e84bd486 100644 --- a/include/gen/QuaternionXYZW.h +++ b/include/gen/QuaternionXYZW.h @@ -15,12 +15,15 @@ namespace Niflib { struct QuaternionXYZW { /*! Default Constructor */ NIFLIB_API QuaternionXYZW(); + /*! Default Destructor */ + NIFLIB_API ~QuaternionXYZW(); /*! Copy Constructor */ NIFLIB_API QuaternionXYZW( const QuaternionXYZW & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API QuaternionXYZW & operator=( const QuaternionXYZW & src ); - /*! Default Destructor */ - NIFLIB_API ~QuaternionXYZW(); + #endif /*! * The x-coordinate. */ diff --git a/include/gen/RagDollDescriptor.h b/include/gen/RagDollDescriptor.h index 6b7f024a..556c1037 100644 --- a/include/gen/RagDollDescriptor.h +++ b/include/gen/RagDollDescriptor.h @@ -15,12 +15,15 @@ namespace Niflib { struct RagDollDescriptor { /*! Default Constructor */ NIFLIB_API RagDollDescriptor(); + /*! Default Destructor */ + NIFLIB_API ~RagDollDescriptor(); /*! Copy Constructor */ NIFLIB_API RagDollDescriptor( const RagDollDescriptor & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API RagDollDescriptor & operator=( const RagDollDescriptor & src ); - /*! Default Destructor */ - NIFLIB_API ~RagDollDescriptor(); + #endif /*! * Unknown. */ diff --git a/include/gen/ShaderTexDesc.h b/include/gen/ShaderTexDesc.h index 5271475c..75ae441b 100644 --- a/include/gen/ShaderTexDesc.h +++ b/include/gen/ShaderTexDesc.h @@ -17,12 +17,15 @@ namespace Niflib { struct ShaderTexDesc { /*! Default Constructor */ NIFLIB_API ShaderTexDesc(); + /*! Default Destructor */ + NIFLIB_API ~ShaderTexDesc(); /*! Copy Constructor */ NIFLIB_API ShaderTexDesc( const ShaderTexDesc & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API ShaderTexDesc & operator=( const ShaderTexDesc & src ); - /*! Default Destructor */ - NIFLIB_API ~ShaderTexDesc(); + #endif /*! * Is it used? */ diff --git a/include/gen/SkinData.h b/include/gen/SkinData.h index 1ced23c2..bc57b4e5 100644 --- a/include/gen/SkinData.h +++ b/include/gen/SkinData.h @@ -17,12 +17,15 @@ namespace Niflib { struct SkinData { /*! Default Constructor */ NIFLIB_API SkinData(); + /*! Default Destructor */ + NIFLIB_API ~SkinData(); /*! Copy Constructor */ NIFLIB_API SkinData( const SkinData & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API SkinData & operator=( const SkinData & src ); - /*! Default Destructor */ - NIFLIB_API ~SkinData(); + #endif /*! * Rotation offset of the skin from this bone in bind position. */ diff --git a/include/gen/SkinPartition.h b/include/gen/SkinPartition.h index 073e5670..ae2fce02 100644 --- a/include/gen/SkinPartition.h +++ b/include/gen/SkinPartition.h @@ -16,12 +16,15 @@ namespace Niflib { struct SkinPartition { /*! Default Constructor */ NIFLIB_API SkinPartition(); + /*! Default Destructor */ + NIFLIB_API ~SkinPartition(); /*! Copy Constructor */ NIFLIB_API SkinPartition( const SkinPartition & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API SkinPartition & operator=( const SkinPartition & src ); - /*! Default Destructor */ - NIFLIB_API ~SkinPartition(); + #endif /*! * Number of vertices in this submesh. */ diff --git a/include/gen/SkinShape.h b/include/gen/SkinShape.h index 0d0d23ea..6ce1d84f 100644 --- a/include/gen/SkinShape.h +++ b/include/gen/SkinShape.h @@ -20,12 +20,15 @@ class NiSkinInstance; struct SkinShape { /*! Default Constructor */ NIFLIB_API SkinShape(); + /*! Default Destructor */ + NIFLIB_API ~SkinShape(); /*! Copy Constructor */ NIFLIB_API SkinShape( const SkinShape & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API SkinShape & operator=( const SkinShape & src ); - /*! Default Destructor */ - NIFLIB_API ~SkinShape(); + #endif /*! * The shape. */ diff --git a/include/gen/SkinShapeGroup.h b/include/gen/SkinShapeGroup.h index a46d807b..c9da2cc7 100644 --- a/include/gen/SkinShapeGroup.h +++ b/include/gen/SkinShapeGroup.h @@ -17,12 +17,15 @@ namespace Niflib { struct SkinShapeGroup { /*! Default Constructor */ NIFLIB_API SkinShapeGroup(); + /*! Default Destructor */ + NIFLIB_API ~SkinShapeGroup(); /*! Copy Constructor */ NIFLIB_API SkinShapeGroup( const SkinShapeGroup & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API SkinShapeGroup & operator=( const SkinShapeGroup & src ); - /*! Default Destructor */ - NIFLIB_API ~SkinShapeGroup(); + #endif /*! * Counts unknown. */ diff --git a/include/gen/SkinWeight.h b/include/gen/SkinWeight.h index ac7ae092..7c7b2a7c 100644 --- a/include/gen/SkinWeight.h +++ b/include/gen/SkinWeight.h @@ -15,12 +15,15 @@ namespace Niflib { struct SkinWeight { /*! Default Constructor */ NIFLIB_API SkinWeight(); + /*! Default Destructor */ + NIFLIB_API ~SkinWeight(); /*! Copy Constructor */ NIFLIB_API SkinWeight( const SkinWeight & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API SkinWeight & operator=( const SkinWeight & src ); - /*! Default Destructor */ - NIFLIB_API ~SkinWeight(); + #endif /*! * The vertex index, in the mesh. */ diff --git a/include/gen/Sphere.h b/include/gen/Sphere.h index d22d7d5c..0ea8fbe3 100644 --- a/include/gen/Sphere.h +++ b/include/gen/Sphere.h @@ -15,12 +15,15 @@ namespace Niflib { struct Sphere { /*! Default Constructor */ NIFLIB_API Sphere(); + /*! Default Destructor */ + NIFLIB_API ~Sphere(); /*! Copy Constructor */ NIFLIB_API Sphere( const Sphere & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API Sphere & operator=( const Sphere & src ); - /*! Default Destructor */ - NIFLIB_API ~Sphere(); + #endif /*! * The sphere's center. */ diff --git a/include/gen/StringPalette.h b/include/gen/StringPalette.h index e4bcbfb8..0407a111 100644 --- a/include/gen/StringPalette.h +++ b/include/gen/StringPalette.h @@ -15,12 +15,15 @@ namespace Niflib { struct StringPalette { /*! Default Constructor */ NIFLIB_API StringPalette(); + /*! Default Destructor */ + NIFLIB_API ~StringPalette(); /*! Copy Constructor */ NIFLIB_API StringPalette( const StringPalette & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API StringPalette & operator=( const StringPalette & src ); - /*! Default Destructor */ - NIFLIB_API ~StringPalette(); + #endif /*! * A bunch of 0x00 seperated strings. */ diff --git a/include/gen/TBC.h b/include/gen/TBC.h index 9968467b..a2947e60 100644 --- a/include/gen/TBC.h +++ b/include/gen/TBC.h @@ -15,12 +15,15 @@ namespace Niflib { struct TBC { /*! Default Constructor */ NIFLIB_API TBC(); + /*! Default Destructor */ + NIFLIB_API ~TBC(); /*! Copy Constructor */ NIFLIB_API TBC( const TBC & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API TBC & operator=( const TBC & src ); - /*! Default Destructor */ - NIFLIB_API ~TBC(); + #endif /*! * Tension. */ diff --git a/include/gen/TexDesc.h b/include/gen/TexDesc.h index d86d0116..50b98fe6 100644 --- a/include/gen/TexDesc.h +++ b/include/gen/TexDesc.h @@ -19,12 +19,15 @@ class NiSourceTexture; struct TexDesc { /*! Default Constructor */ NIFLIB_API TexDesc(); + /*! Default Destructor */ + NIFLIB_API ~TexDesc(); /*! Copy Constructor */ NIFLIB_API TexDesc( const TexDesc & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API TexDesc & operator=( const TexDesc & src ); - /*! Default Destructor */ - NIFLIB_API ~TexDesc(); + #endif /*! * NiSourceTexture object index. */ diff --git a/include/gen/TexSource.h b/include/gen/TexSource.h index d7b0a930..2577ac77 100644 --- a/include/gen/TexSource.h +++ b/include/gen/TexSource.h @@ -20,12 +20,15 @@ class NiPixelData; struct TexSource { /*! Default Constructor */ NIFLIB_API TexSource(); + /*! Default Destructor */ + NIFLIB_API ~TexSource(); /*! Copy Constructor */ NIFLIB_API TexSource( const TexSource & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API TexSource & operator=( const TexSource & src ); - /*! Default Destructor */ - NIFLIB_API ~TexSource(); + #endif /*! * Is the texture external? */ diff --git a/include/gen/hkTriangle.h b/include/gen/hkTriangle.h index ab477297..0a450096 100644 --- a/include/gen/hkTriangle.h +++ b/include/gen/hkTriangle.h @@ -15,12 +15,15 @@ namespace Niflib { struct hkTriangle { /*! Default Constructor */ NIFLIB_API hkTriangle(); + /*! Default Destructor */ + NIFLIB_API ~hkTriangle(); /*! Copy Constructor */ NIFLIB_API hkTriangle( const hkTriangle & src ); + //This operator give SWIG problems + #ifndef SWIG /*! Copy Operator */ NIFLIB_API hkTriangle & operator=( const hkTriangle & src ); - /*! Default Destructor */ - NIFLIB_API ~hkTriangle(); + #endif /*! * The triangle. */ diff --git a/include/obj/NiExtraData.h b/include/obj/NiExtraData.h index 7e93ec4d..d89badc7 100644 --- a/include/obj/NiExtraData.h +++ b/include/obj/NiExtraData.h @@ -54,7 +54,7 @@ public: * the target version. * \return The name of this NiExtraData object. */ - string GetName(); + NIFLIB_API string GetName(); /*! Sets the name of this NiExtraData object. Will only be written to later * version NIF files. -- GitLab