Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 04:18:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

found and removed another STL-ism

Browse source
This commit is contained in:
Heather Anderson 2020-05-25 15:51:48 -07:00
parent 84a8c640e4
commit 3cff3f8b5d
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/ui/src/ui/types/ContextAwareProfile.cpp
View file

@ -38,12 +38,12 @@ RestrictedContextMonitor::TSharedPointer RestrictedContextMonitor::getMonitor(QQ
gl_monitorMapProtect.lock(); gl_monitorMapProtect.lock();
TMonitorMap::const_iterator lookup = gl_monitorMap.find(context); TMonitorMap::const_iterator lookup = gl_monitorMap.find(context);
if (lookup != gl_monitorMap.end()) { if (lookup != gl_monitorMap.end()) {
monitor = lookup->second.lock(); monitor = lookup.value().lock();
assert(monitor); assert(monitor);
} else if(createIfMissing) { } else if(createIfMissing) {
monitor = TSharedPointer::create(context); monitor = TSharedPointer::create(context);
monitor->_selfPointer = monitor; monitor->_selfPointer = monitor;
gl_monitorMap.insert(TMonitorMap::value_type(context, monitor)); gl_monitorMap.insert(context, monitor);
} }
gl_monitorMapProtect.unlock(); gl_monitorMapProtect.unlock();
return monitor; return monitor;

3
libraries/ui/src/ui/types/ContextAwareProfile.h
View file

@ -12,6 +12,7 @@
#define hifi_ContextAwareProfile_h #define hifi_ContextAwareProfile_h
#include <QtCore/QtGlobal> #include <QtCore/QtGlobal>
#include <QtCore/QMap>
#include <QtCore/QMutex> #include <QtCore/QMutex>
#include <QtCore/QSharedPointer> #include <QtCore/QSharedPointer>
@ -53,7 +54,7 @@ public:
bool _isUninitialized{ true }; bool _isUninitialized{ true };
private: private:
typedef std::map<QQmlContext*, TWeakPointer> TMonitorMap; typedef QMap<QQmlContext*, TWeakPointer> TMonitorMap;
static QMutex gl_monitorMapProtect; static QMutex gl_monitorMapProtect;
static TMonitorMap gl_monitorMap; static TMonitorMap gl_monitorMap;