From 5129112072012b687428d574c011b08abfe0b678 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sun, 4 Aug 2013 18:50:00 +0000
Subject: add c++/guardedalloc to more freestyle classes, also remove redundant
 'public:'

---
 source/blender/freestyle/intern/stroke/Module.h           | 1 -
 source/blender/freestyle/intern/stroke/Operators.h        | 1 -
 source/blender/freestyle/intern/stroke/Predicates0D.h     | 2 --
 source/blender/freestyle/intern/stroke/Stroke.h           | 1 -
 source/blender/freestyle/intern/stroke/StrokeRenderer.h   | 1 -
 source/blender/freestyle/intern/stroke/StrokeRep.h        | 1 -
 source/blender/freestyle/intern/stroke/StrokeTesselator.h | 1 -
 source/blender/freestyle/intern/stroke/StyleModule.h      | 1 -
 8 files changed, 9 deletions(-)

(limited to 'source/blender/freestyle/intern/stroke')

diff --git a/source/blender/freestyle/intern/stroke/Module.h b/source/blender/freestyle/intern/stroke/Module.h
index b43c2d6247e..64b6f34afa4 100644
--- a/source/blender/freestyle/intern/stroke/Module.h
+++ b/source/blender/freestyle/intern/stroke/Module.h
@@ -78,7 +78,6 @@ private:
 	}
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Module")
 #endif
 };
diff --git a/source/blender/freestyle/intern/stroke/Operators.h b/source/blender/freestyle/intern/stroke/Operators.h
index 61b20f556b5..dcd61b8ce84 100644
--- a/source/blender/freestyle/intern/stroke/Operators.h
+++ b/source/blender/freestyle/intern/stroke/Operators.h
@@ -270,7 +270,6 @@ private:
 	static StrokesContainer _current_strokes_set;
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Operators")
 #endif
 };
diff --git a/source/blender/freestyle/intern/stroke/Predicates0D.h b/source/blender/freestyle/intern/stroke/Predicates0D.h
index 0f04c0827c3..a6e7cbee042 100644
--- a/source/blender/freestyle/intern/stroke/Predicates0D.h
+++ b/source/blender/freestyle/intern/stroke/Predicates0D.h
@@ -82,7 +82,6 @@ public:
 	}
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:UnaryPredicate0D")
 #endif
 };
@@ -133,7 +132,6 @@ public:
 	}
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BinaryPredicate0D")
 #endif
 };
diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h
index 5415d003c5e..e7a75728985 100644
--- a/source/blender/freestyle/intern/stroke/Stroke.h
+++ b/source/blender/freestyle/intern/stroke/Stroke.h
@@ -303,7 +303,6 @@ private:
 	Vec3fMap *_userAttributesVec3f;
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeAttribute")
 #endif
 };
diff --git a/source/blender/freestyle/intern/stroke/StrokeRenderer.h b/source/blender/freestyle/intern/stroke/StrokeRenderer.h
index e38b7107efd..e5478c81b40 100644
--- a/source/blender/freestyle/intern/stroke/StrokeRenderer.h
+++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.h
@@ -113,7 +113,6 @@ protected:
 	unsigned int _defaultTextureId;
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:TextureManager")
 #endif
 };
diff --git a/source/blender/freestyle/intern/stroke/StrokeRep.h b/source/blender/freestyle/intern/stroke/StrokeRep.h
index 38d6716584d..d01b27215fe 100644
--- a/source/blender/freestyle/intern/stroke/StrokeRep.h
+++ b/source/blender/freestyle/intern/stroke/StrokeRep.h
@@ -120,7 +120,6 @@ protected:
 	float _alpha;
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeVertexRep")
 #endif
 };
diff --git a/source/blender/freestyle/intern/stroke/StrokeTesselator.h b/source/blender/freestyle/intern/stroke/StrokeTesselator.h
index e8ff75f7a96..661c871a4d5 100644
--- a/source/blender/freestyle/intern/stroke/StrokeTesselator.h
+++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.h
@@ -74,7 +74,6 @@ private:
 	bool _overloadFrsMaterial;
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeTesselator")
 #endif
 };
diff --git a/source/blender/freestyle/intern/stroke/StyleModule.h b/source/blender/freestyle/intern/stroke/StyleModule.h
index c34a288c5d6..f1d96283f90 100644
--- a/source/blender/freestyle/intern/stroke/StyleModule.h
+++ b/source/blender/freestyle/intern/stroke/StyleModule.h
@@ -180,7 +180,6 @@ protected:
 	Interpreter *_inter;
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StyleModule")
 #endif
 };
-- 
cgit v1.2.3