diff options
| author | dcheng <dcheng@chromium.org> | 2016-03-03 14:09:15 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-03 22:10:20 +0000 |
| commit | 6e5c22f946c8713f3a585e54b40954d770402579 (patch) | |
| tree | 3e68b77dcca4c3ce77008122c4aa3671b8634067 /chromeos | |
| parent | 60d08d73239ed483f80d19a34954560daac392e8 (diff) | |
| download | chromium_src-6e5c22f946c8713f3a585e54b40954d770402579.zip chromium_src-6e5c22f946c8713f3a585e54b40954d770402579.tar.gz chromium_src-6e5c22f946c8713f3a585e54b40954d770402579.tar.bz2 | |
Change scoped_ptr to be a type alias for std::unique_ptr on OS_LINUX.
BUG=554298,579269,579270
R=danakj@chromium.org,ddorwin@chromium.org,lcwu@chromium.org,rdvelin.cronin@chromium.org,satorux@chromium.org
TBR=thakis@chromium.org,yoshiki@chromium.org
Review URL: https://codereview.chromium.org/1750143004
Cr-Commit-Position: refs/heads/master@{#379108}
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/cryptohome/cryptohome_parameters.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromeos/cryptohome/cryptohome_parameters.cc b/chromeos/cryptohome/cryptohome_parameters.cc index 8b65a71..c484947 100644 --- a/chromeos/cryptohome/cryptohome_parameters.cc +++ b/chromeos/cryptohome/cryptohome_parameters.cc @@ -109,10 +109,10 @@ KeyDefinition::ProviderData::~ProviderData() { } bool KeyDefinition::ProviderData::operator==(const ProviderData& other) const { - const bool has_number = number; - const bool other_has_number = other.number; - const bool has_bytes = bytes; - const bool other_has_bytes = other.bytes; + const bool has_number = number != nullptr; + const bool other_has_number = other.number != nullptr; + const bool has_bytes = bytes != nullptr; + const bool other_has_bytes = other.bytes != nullptr; return name == other.name && has_number == other_has_number && has_bytes == other_has_bytes && |