Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh

Browse Source 
# Conflicts:
#	indra/llcommon/llindexedvector.h
This commit is contained in:
Liru Færs
2019-08-15 20:50:36 -04:00
parent 5eef36c47a 5c156a9d86
commit 1b52b3e685
39 changed files with 437 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llcommon/llindexedvector.h
View File

@@ -79,7 +79,7 @@ public:
return std::find_if(mVector.begin(), mVector.end(), [&k](const typename vec_type_t::value_type& e) { return e.first == k; });
}
typedef DeletePairedPointer DeletePointer;
using DeletePointer = ::DeletePairedPointer;
};
template <typename Type, typename Key, int BlockSize = 32>
@@ -189,7 +189,7 @@ public:
}
}
typedef ::DeletePointer DeletePointer;
using DeletePointer = ::DeletePointer;
};
template <typename Type, typename Key, int BlockSize = 32>