diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
| commit | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch) | |
| tree | 988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/WebKit/win/WebKitCOMAPI.cpp | |
| parent | dd91e772430dc294e3bf478c119ef8d43c0a3358 (diff) | |
| download | qtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz | |
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/WebKit/win/WebKitCOMAPI.cpp')
| -rw-r--r-- | Source/WebKit/win/WebKitCOMAPI.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/WebKit/win/WebKitCOMAPI.cpp b/Source/WebKit/win/WebKitCOMAPI.cpp index c4450f749..9c9cc026b 100644 --- a/Source/WebKit/win/WebKitCOMAPI.cpp +++ b/Source/WebKit/win/WebKitCOMAPI.cpp @@ -51,10 +51,9 @@ static COMPtr<IClassFactory> classFactory(const CLSID& clsid) typedef HashMap<CLSID, COMPtr<IClassFactory>, CLSIDHash, CLSIDHashTraits> FactoryMap; static FactoryMap& factories = *new FactoryMap; - pair<FactoryMap::iterator, bool> result = factories.add(clsid, 0); - COMPtr<IClassFactory>& factory = result.first->second; - bool added = result.second; - if (added && FAILED(DllGetClassObject(clsid, __uuidof(factory), reinterpret_cast<void**>(&factory)))) + FactoryMap::AddResult result = factories.add(clsid, 0); + COMPtr<IClassFactory>& factory = result.iterator->second; + if (result.isNewEntry && FAILED(DllGetClassObject(clsid, __uuidof(factory), reinterpret_cast<void**>(&factory)))) factory = 0; return factory; |