Removed a few uses of '#ifdef SWIG', mainly from areas where they would no longer work. e.g where the code has been templatized since the #ifdef was added so we can see that the SWIG version of the code is out of date and won't build anyway.

This commit is contained in:
David Williams 2015-05-08 21:08:43 +02:00
parent 3c31643e4f
commit 09253a7bcc
7 changed files with 3 additions and 19 deletions

View File

@ -104,7 +104,7 @@ namespace PolyVox
int32_t mYPosInVolume; int32_t mYPosInVolume;
int32_t mZPosInVolume; int32_t mZPosInVolume;
}; };
#endif #endif // SWIG
public: public:
/// Gets a voxel at the position given by <tt>x,y,z</tt> coordinates /// Gets a voxel at the position given by <tt>x,y,z</tt> coordinates

View File

@ -36,12 +36,8 @@ freely, subject to the following restrictions:
namespace PolyVox namespace PolyVox
{ {
#ifdef SWIG
struct CubicVertex
#else
template<typename _DataType> template<typename _DataType>
struct CubicVertex struct CubicVertex
#endif
{ {
typedef _DataType DataType; typedef _DataType DataType;

View File

@ -35,12 +35,8 @@ freely, subject to the following restrictions:
namespace PolyVox namespace PolyVox
{ {
#ifdef SWIG
struct MarchingCubesVertex
#else
template<typename _DataType> template<typename _DataType>
struct MarchingCubesVertex struct MarchingCubesVertex
#endif
{ {
typedef _DataType DataType; typedef _DataType DataType;

View File

@ -253,7 +253,7 @@ namespace PolyVox
const uint16_t m_uChunkSideLengthMinusOne; const uint16_t m_uChunkSideLengthMinusOne;
}; };
#endif #endif // SWIG
public: public:
/// Constructor for creating a fixed size volume. /// Constructor for creating a fixed size volume.

View File

@ -114,7 +114,7 @@ namespace PolyVox
bool m_bIsCurrentPositionValidInY; bool m_bIsCurrentPositionValidInY;
bool m_bIsCurrentPositionValidInZ; bool m_bIsCurrentPositionValidInZ;
}; };
#endif #endif // SWIG
public: public:
/// Constructor for creating a fixed size volume. /// Constructor for creating a fixed size volume.

View File

@ -49,11 +49,7 @@ namespace PolyVox
* about these definitions. * about these definitions.
* *
*/ */
#ifdef SWIG
class Region class Region
#else
class Region
#endif
{ {
public: public:

View File

@ -33,12 +33,8 @@ freely, subject to the following restrictions:
namespace PolyVox namespace PolyVox
{ {
#ifdef SWIG
struct Vertex
#else
template<typename _DataType> template<typename _DataType>
struct Vertex struct Vertex
#endif
{ {
typedef _DataType DataType; typedef _DataType DataType;