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/geometry/BBox.h         | 1 -
 source/blender/freestyle/intern/geometry/FastGrid.h     | 5 +++++
 source/blender/freestyle/intern/geometry/Grid.h         | 3 ---
 source/blender/freestyle/intern/geometry/Noise.h        | 1 -
 source/blender/freestyle/intern/geometry/Polygon.h      | 1 -
 source/blender/freestyle/intern/geometry/SweepLine.h    | 2 --
 source/blender/freestyle/intern/geometry/VecMat.h       | 2 --
 source/blender/freestyle/intern/geometry/normal_cycle.h | 1 -
 8 files changed, 5 insertions(+), 11 deletions(-)

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

diff --git a/source/blender/freestyle/intern/geometry/BBox.h b/source/blender/freestyle/intern/geometry/BBox.h
index 04fe6118815..794ceba48e7 100644
--- a/source/blender/freestyle/intern/geometry/BBox.h
+++ b/source/blender/freestyle/intern/geometry/BBox.h
@@ -136,7 +136,6 @@ private:
 	bool _empty;
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BBox")
 #endif
 };
diff --git a/source/blender/freestyle/intern/geometry/FastGrid.h b/source/blender/freestyle/intern/geometry/FastGrid.h
index 510a2b94225..e292589b7cf 100644
--- a/source/blender/freestyle/intern/geometry/FastGrid.h
+++ b/source/blender/freestyle/intern/geometry/FastGrid.h
@@ -76,6 +76,11 @@ public:
 protected:
 	Cell **_cells;
 	unsigned _cells_size;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:FastGrid")
+#endif
+
 };
 
 } /* namespace Freestyle */
diff --git a/source/blender/freestyle/intern/geometry/Grid.h b/source/blender/freestyle/intern/geometry/Grid.h
index 08b614faa95..a1368f1ea21 100644
--- a/source/blender/freestyle/intern/geometry/Grid.h
+++ b/source/blender/freestyle/intern/geometry/Grid.h
@@ -89,7 +89,6 @@ private:
 	OccludersSet _occluders;
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Cell")
 #endif
 };
@@ -372,7 +371,6 @@ protected:
 	OccludersSet _occluders;  // List of all occluders inserted in the grid
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Grid")
 #endif
 };
@@ -395,7 +393,6 @@ private:
 	OccludersSet::iterator it, end;
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:VirtualOccludersSet")
 #endif
 };
diff --git a/source/blender/freestyle/intern/geometry/Noise.h b/source/blender/freestyle/intern/geometry/Noise.h
index cd1be53a5aa..8798bc45a93 100644
--- a/source/blender/freestyle/intern/geometry/Noise.h
+++ b/source/blender/freestyle/intern/geometry/Noise.h
@@ -81,7 +81,6 @@ private:
 	// int start;
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Noise")
 #endif
 };
diff --git a/source/blender/freestyle/intern/geometry/Polygon.h b/source/blender/freestyle/intern/geometry/Polygon.h
index cfeae8fd632..d8b891c77cc 100644
--- a/source/blender/freestyle/intern/geometry/Polygon.h
+++ b/source/blender/freestyle/intern/geometry/Polygon.h
@@ -171,7 +171,6 @@ protected:
 	unsigned _id;
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Geometry:Polygon")
 #endif
 };
diff --git a/source/blender/freestyle/intern/geometry/SweepLine.h b/source/blender/freestyle/intern/geometry/SweepLine.h
index 86058a434bf..039ecd7ebf4 100644
--- a/source/blender/freestyle/intern/geometry/SweepLine.h
+++ b/source/blender/freestyle/intern/geometry/SweepLine.h
@@ -190,7 +190,6 @@ private:
 	bool _order; // true if A and B are in the same order than _edge.A and _edge.B. false otherwise.
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Segment")
 #endif
 };
@@ -337,7 +336,6 @@ private:
 	std::vector<Intersection<Segment<T, Point> > *> _Intersections; // the list of all intersections.
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:SweepLine")
 #endif
 };
diff --git a/source/blender/freestyle/intern/geometry/VecMat.h b/source/blender/freestyle/intern/geometry/VecMat.h
index 1948dadb207..c3aae0601fe 100644
--- a/source/blender/freestyle/intern/geometry/VecMat.h
+++ b/source/blender/freestyle/intern/geometry/VecMat.h
@@ -278,7 +278,6 @@ protected:
 	};
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:VecMat:Vec")
 #endif
 };
@@ -766,7 +765,6 @@ protected:
 	value_type _coord[_SIZE];
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:VecMat:Matrix")
 #endif
 };
diff --git a/source/blender/freestyle/intern/geometry/normal_cycle.h b/source/blender/freestyle/intern/geometry/normal_cycle.h
index 441fca7ac5f..7a63acdf52a 100644
--- a/source/blender/freestyle/intern/geometry/normal_cycle.h
+++ b/source/blender/freestyle/intern/geometry/normal_cycle.h
@@ -129,7 +129,6 @@ private:
 	int i_[3];
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:OGF:NormalCycle")
 #endif
 };
-- 
cgit v1.2.3