From e7daab5bbc565f76ec73712bec3bf075332ce1e2 Mon Sep 17 00:00:00 2001
From: Matt Williams <matt@milliams.com>
Date: Sat, 24 Nov 2012 15:20:34 +0000
Subject: [PATCH] Simplify macro by assuming PolyVox:: in front of all classes

---
 library/bindings/BaseVolume.i   |  2 +-
 library/bindings/LargeVolume.i  |  2 +-
 library/bindings/PolyVoxCore.i  | 12 ++++++------
 library/bindings/RawVolume.i    |  2 +-
 library/bindings/SimpleVolume.i |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/library/bindings/BaseVolume.i b/library/bindings/BaseVolume.i
index 3ae83f30..4cdba718 100644
--- a/library/bindings/BaseVolume.i
+++ b/library/bindings/BaseVolume.i
@@ -9,4 +9,4 @@
 %include "Density.h"
 %include "BaseVolume.h"
 
-VOLUMETYPES(BaseVolume, PolyVox::BaseVolume)
+VOLUMETYPES(BaseVolume)
diff --git a/library/bindings/LargeVolume.i b/library/bindings/LargeVolume.i
index fb4bbffe..58b80050 100644
--- a/library/bindings/LargeVolume.i
+++ b/library/bindings/LargeVolume.i
@@ -9,4 +9,4 @@
 %include "Density.h"
 %include "LargeVolume.h"
 
-VOLUMETYPES(LargeVolume, PolyVox::LargeVolume)
+VOLUMETYPES(LargeVolume)
diff --git a/library/bindings/PolyVoxCore.i b/library/bindings/PolyVoxCore.i
index 55ef7371..72bdbbef 100644
--- a/library/bindings/PolyVoxCore.i
+++ b/library/bindings/PolyVoxCore.i
@@ -26,12 +26,12 @@ const char* __str__() {
 
 //Centralise this to avoid repeating ourselves
 //This macro will be called in the volume interface files to define the various volume types.
-%define VOLUMETYPES(shortname, class)
-%template(shortname ## Density8) class<PolyVox::Density8>;
-%template(shortname ## Material8) class<PolyVox::Material8>;
-%template(shortname ## Material16) class<PolyVox::Material16>;
-%template(shortname ## MaterialDensityPair44) class<PolyVox::MaterialDensityPair44>;
-%template(shortname ## MaterialDensityPair88) class<PolyVox::MaterialDensityPair88>;
+%define VOLUMETYPES(class)
+%template(class ## Density8) PolyVox::class<PolyVox::Density8>;
+%template(class ## Material8) PolyVox::class<PolyVox::Material8>;
+%template(class ## Material16) PolyVox::class<PolyVox::Material16>;
+%template(class ## MaterialDensityPair44) PolyVox::class<PolyVox::MaterialDensityPair44>;
+%template(class ## MaterialDensityPair88) PolyVox::class<PolyVox::MaterialDensityPair88>;
 %enddef
 
 %feature("autodoc", "1");
diff --git a/library/bindings/RawVolume.i b/library/bindings/RawVolume.i
index c7e2af49..dbbd57da 100644
--- a/library/bindings/RawVolume.i
+++ b/library/bindings/RawVolume.i
@@ -9,4 +9,4 @@
 %include "Density.h"
 %include "RawVolume.h"
 
-VOLUMETYPES(RawVolume, PolyVox::RawVolume)
+VOLUMETYPES(RawVolume)
diff --git a/library/bindings/SimpleVolume.i b/library/bindings/SimpleVolume.i
index 35dfdde7..249dd0c7 100644
--- a/library/bindings/SimpleVolume.i
+++ b/library/bindings/SimpleVolume.i
@@ -9,4 +9,4 @@
 %include "Density.h"
 %include "SimpleVolume.h"
 
-VOLUMETYPES(SimpleVolume, PolyVox::SimpleVolume)
+VOLUMETYPES(SimpleVolume)