From 8a68df0fc53a8288333d503c1d059952ad2c0244 Mon Sep 17 00:00:00 2001
From: cignoni <paolo.cignoni@isti.cnr.it>
Date: Mon, 6 Jun 2016 08:55:33 +0000
Subject: [PATCH] Small changes to allow clang compilation

---
 wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h          | 4 ++--
 .../qt_thread_safe_mesh_attributes_multi_viewer_bo_manager.h  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h b/wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h
index 8f484bc0..3b24284b 100644
--- a/wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h
+++ b/wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h
@@ -265,7 +265,7 @@ namespace vcg
         }
 
     protected:
-        template<typename MESH_TYPE,typename UNIQUE_VIEW_ID_TYPE,typename GL_OPTIONS_DERIVED_TYPE> friend class NotThreadSafeGLMeshAttributesMultiViewerBOManager;
+        template<typename MESH_TYPE,typename UNIQUE_VIEW_ID_TYPE, typename XX_GL_OPTIONS_DERIVED_TYPE> friend class NotThreadSafeGLMeshAttributesMultiViewerBOManager;
 
         typedef std::vector<InternalRendAtts> PerRendModData;
 
@@ -450,7 +450,7 @@ namespace vcg
 
         void setGLOptions(UNIQUE_VIEW_ID_TYPE viewid,const GL_OPTIONS_DERIVED_TYPE& opts)
         {
-            ViewsMap::iterator it = _perviewreqatts.find(viewid);
+            typename ViewsMap::iterator it = _perviewreqatts.find(viewid);
             if (it == _perviewreqatts.end())
                 return;
             it->second.set(opts);
diff --git a/wrap/qt/qt_thread_safe_mesh_attributes_multi_viewer_bo_manager.h b/wrap/qt/qt_thread_safe_mesh_attributes_multi_viewer_bo_manager.h
index 6b4721b3..ecd7e8e7 100644
--- a/wrap/qt/qt_thread_safe_mesh_attributes_multi_viewer_bo_manager.h
+++ b/wrap/qt/qt_thread_safe_mesh_attributes_multi_viewer_bo_manager.h
@@ -44,7 +44,7 @@ namespace vcg
 		
 		~QtThreadSafeGLMeshAttributesMultiViewerBOManager() {}
 
-        void meshAttributesUpdated(bool hasmeshconnectivitychanged,const RendAtts& changedrendatts)
+        void meshAttributesUpdated(bool hasmeshconnectivitychanged,const GLMeshAttributesInfo::RendAtts& changedrendatts)
 		{
 			QWriteLocker locker(&_lock);
 			vcg::NotThreadSafeGLMeshAttributesMultiViewerBOManager<MESH_TYPE,UNIQUE_VIEW_ID_TYPE,GL_OPTIONS_DERIVED_TYPE>::meshAttributesUpdated(hasmeshconnectivitychanged,changedrendatts);