manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Small changes to allow clang compilation

This commit is contained in:
Paolo Cignoni 2016-06-06 08:55:33 +00:00
parent 0f9cf2e947
commit 8a68df0fc5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h
View File

@ -265,7 +265,7 @@ namespace vcg
} }
protected: 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; typedef std::vector<InternalRendAtts> PerRendModData;
@ -450,7 +450,7 @@ namespace vcg
void setGLOptions(UNIQUE_VIEW_ID_TYPE viewid,const GL_OPTIONS_DERIVED_TYPE& opts) 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()) if (it == _perviewreqatts.end())
return; return;
it->second.set(opts); it->second.set(opts);

2
wrap/qt/qt_thread_safe_mesh_attributes_multi_viewer_bo_manager.h
View File

@ -44,7 +44,7 @@ namespace vcg
~QtThreadSafeGLMeshAttributesMultiViewerBOManager() {} ~QtThreadSafeGLMeshAttributesMultiViewerBOManager() {}
void meshAttributesUpdated(bool hasmeshconnectivitychanged,const RendAtts& changedrendatts) void meshAttributesUpdated(bool hasmeshconnectivitychanged,const GLMeshAttributesInfo::RendAtts& changedrendatts)
{ {
QWriteLocker locker(&_lock); QWriteLocker locker(&_lock);
vcg::NotThreadSafeGLMeshAttributesMultiViewerBOManager<MESH_TYPE,UNIQUE_VIEW_ID_TYPE,GL_OPTIONS_DERIVED_TYPE>::meshAttributesUpdated(hasmeshconnectivitychanged,changedrendatts); vcg::NotThreadSafeGLMeshAttributesMultiViewerBOManager<MESH_TYPE,UNIQUE_VIEW_ID_TYPE,GL_OPTIONS_DERIVED_TYPE>::meshAttributesUpdated(hasmeshconnectivitychanged,changedrendatts);