From 1e715b6877b6a41bee73f25a8f9c69f391611634 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 24 Jun 2013 12:27:19 +0000
Subject: [PATCH] From Sukender, "I recently pulled from the GIT mirror and
 found that "OSG_USE_DEPRECATED_GEOMETRY_METHODS=OFF" hides a little mistake:
 there is a "#include <osg/Notify>" inside the "osg" namespace, in
 inlude/osg/Geometry. "

---
 include/osg/Geometry | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/osg/Geometry b/include/osg/Geometry
index 46a48b53c..67705cf0a 100644
--- a/include/osg/Geometry
+++ b/include/osg/Geometry
@@ -309,11 +309,14 @@ inline Geometry* createTexturedQuadGeometry(const Vec3& corner,const Vec3& width
     return createTexturedQuadGeometry(corner,widthVec,heightVec, 0.0f, 0.0f, s, t);
 }
 
+} // namespace osg
 
 #if defined(OSG_USE_DEPRECATED_GEOMETRY_METHODS)
 
 #include <osg/Notify>
 
+namespace osg {
+
 inline void Geometry::setVertexIndices(IndexArray* array)
 {
     if (_vertexArray.valid()) { _vertexArray->setUserData(array); if (array)  _containsDeprecatedData = true; }
@@ -391,8 +394,9 @@ inline const IndexArray* Geometry::getVertexAttribIndices(unsigned int index) co
     if (index<_vertexAttribList.size() && _vertexAttribList[index].valid()) return dynamic_cast<IndexArray*>(_vertexAttribList[index]->getUserData());
     else return 0;
 }
-#endif
 
-}
+} // namespace osg
+
+#endif
 
 #endif