From 3cff3f8b5deaba040c519adb8e43b619f5b55906 Mon Sep 17 00:00:00 2001 From: Heather Anderson Date: Mon, 25 May 2020 15:51:48 -0700 Subject: [PATCH] found and removed another STL-ism --- libraries/ui/src/ui/types/ContextAwareProfile.cpp | 4 ++-- libraries/ui/src/ui/types/ContextAwareProfile.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/ui/src/ui/types/ContextAwareProfile.cpp b/libraries/ui/src/ui/types/ContextAwareProfile.cpp index 0374de87ff..ef17ad7229 100644 --- a/libraries/ui/src/ui/types/ContextAwareProfile.cpp +++ b/libraries/ui/src/ui/types/ContextAwareProfile.cpp @@ -38,12 +38,12 @@ RestrictedContextMonitor::TSharedPointer RestrictedContextMonitor::getMonitor(QQ gl_monitorMapProtect.lock(); TMonitorMap::const_iterator lookup = gl_monitorMap.find(context); if (lookup != gl_monitorMap.end()) { - monitor = lookup->second.lock(); + monitor = lookup.value().lock(); assert(monitor); } else if(createIfMissing) { monitor = TSharedPointer::create(context); monitor->_selfPointer = monitor; - gl_monitorMap.insert(TMonitorMap::value_type(context, monitor)); + gl_monitorMap.insert(context, monitor); } gl_monitorMapProtect.unlock(); return monitor; diff --git a/libraries/ui/src/ui/types/ContextAwareProfile.h b/libraries/ui/src/ui/types/ContextAwareProfile.h index ec0590eda5..99fee8112d 100644 --- a/libraries/ui/src/ui/types/ContextAwareProfile.h +++ b/libraries/ui/src/ui/types/ContextAwareProfile.h @@ -12,6 +12,7 @@ #define hifi_ContextAwareProfile_h #include +#include #include #include @@ -53,7 +54,7 @@ public: bool _isUninitialized{ true }; private: - typedef std::map TMonitorMap; + typedef QMap TMonitorMap; static QMutex gl_monitorMapProtect; static TMonitorMap gl_monitorMap;