Commit d9afd548 authored by scottmg's avatar scottmg Committed by Commit bot

Fix missing .Pass() on returning scoped_ptr<SdchManager::DictionarySet>

Warns on VS2015. I'm not sure why this is new, I guess something
become move-able (or not-move-able).

d:\src\cr3\src\net\base\sdch_manager.cc(459): error C2248: 'scoped_ptr<net::SdchManager::DictionarySet,base::DefaultDeleter<T>>::scoped_ptr': cannot access private
member declared in class 'scoped_ptr<net::SdchManager::DictionarySet,base::DefaultDeleter<T>>'
        with
        [
            T=net::SdchManager::DictionarySet
        ]
d:\src\cr3\src\base\memory\scoped_ptr.h(312): note: see declaration of 'scoped_ptr<net::SdchManager::DictionarySet,base::DefaultDeleter<T>>::scoped_ptr'
        with
        [
            T=net::SdchManager::DictionarySet
        ]
d:\src\cr3\src\net\base\sdch_manager.cc(463): error C2248: 'scoped_ptr<net::SdchManager::DictionarySet,base::DefaultDeleter<T>>::scoped_ptr': cannot access private
member declared in class 'scoped_ptr<net::SdchManager::DictionarySet,base::DefaultDeleter<T>>'
        with
        [
            T=net::SdchManager::DictionarySet
        ]
d:\src\cr3\src\base\memory\scoped_ptr.h(312): note: see declaration of 'scoped_ptr<net::SdchManager::DictionarySet,base::DefaultDeleter<T>>::scoped_ptr'
        with
        [
            T=net::SdchManager::DictionarySet
        ]
d:\src\cr3\src\net\base\sdch_manager.cc(467): error C2248: 'scoped_ptr<net::SdchManager::DictionarySet,base::DefaultDeleter<T>>::scoped_ptr': cannot access private
member declared in class 'scoped_ptr<net::SdchManager::DictionarySet,base::DefaultDeleter<T>>'
        with
        [
            T=net::SdchManager::DictionarySet
        ]
d:\src\cr3\src\base\memory\scoped_ptr.h(312): note: see declaration of 'scoped_ptr<net::SdchManager::DictionarySet,base::DefaultDeleter<T>>::scoped_ptr'
        with
        [
            T=net::SdchManager::DictionarySet
        ]

R=rsleevi@chromium.org
BUG=440500

Review URL: https://codereview.chromium.org/883753004

Cr-Commit-Position: refs/heads/master@{#313399}
parent 383bba24
......@@ -456,15 +456,15 @@ SdchManager::GetDictionarySetByHash(
*problem_code = SDCH_DICTIONARY_HASH_NOT_FOUND;
const auto& it = dictionaries_.find(server_hash);
if (it == dictionaries_.end())
return result;
return result.Pass();
*problem_code = it->second->data.CanUse(target_url);
if (*problem_code != SDCH_OK)
return result;
return result.Pass();
result.reset(new DictionarySet);
result->AddDictionary(it->first, it->second);
return result;
return result.Pass();
}
// static
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment