comparison base/Profiler.cpp @ 1586:841b2a3e606d

Merge from branch fix-static-analysis
author Chris Cannam
date Wed, 09 Jan 2019 15:24:38 +0000
parents 70e172e6cc59
children ecd3152750a5
comparison
equal deleted inserted replaced
1585:9570ef94eaa3 1586:841b2a3e606d
27 #include <vector> 27 #include <vector>
28 #include <algorithm> 28 #include <algorithm>
29 #include <set> 29 #include <set>
30 #include <map> 30 #include <map>
31 31
32 Profiles* Profiles::m_instance = 0; 32 Profiles* Profiles::m_instance = nullptr;
33 33
34 Profiles* Profiles::getInstance() 34 Profiles* Profiles::getInstance()
35 { 35 {
36 if (!m_instance) m_instance = new Profiles(); 36 if (!m_instance) m_instance = new Profiles();
37 37