Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Side by Side Diff: base/win/scoped_variant.cc

Issue 1467003002: Switch to static_assert in base/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: / Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « base/win/scoped_comptr.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/win/scoped_variant.h" 5 #include "base/win/scoped_variant.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 7
8 namespace base { 8 namespace base {
9 namespace win { 9 namespace win {
10 10
11 // Global, const instance of an empty variant. 11 // Global, const instance of an empty variant.
12 const VARIANT ScopedVariant::kEmptyVariant = {{{VT_EMPTY}}}; 12 const VARIANT ScopedVariant::kEmptyVariant = {{{VT_EMPTY}}};
13 13
14 ScopedVariant::~ScopedVariant() { 14 ScopedVariant::~ScopedVariant() {
15 COMPILE_ASSERT(sizeof(ScopedVariant) == sizeof(VARIANT), ScopedVariantSize); 15 static_assert(sizeof(ScopedVariant) == sizeof(VARIANT), "ScopedVariantSize");
16 ::VariantClear(&var_); 16 ::VariantClear(&var_);
17 } 17 }
18 18
19 ScopedVariant::ScopedVariant(const wchar_t* str) { 19 ScopedVariant::ScopedVariant(const wchar_t* str) {
20 var_.vt = VT_EMPTY; 20 var_.vt = VT_EMPTY;
21 Set(str); 21 Set(str);
22 } 22 }
23 23
24 ScopedVariant::ScopedVariant(const wchar_t* str, UINT length) { 24 ScopedVariant::ScopedVariant(const wchar_t* str, UINT length) {
25 var_.vt = VT_BSTR; 25 var_.vt = VT_BSTR;
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 267
268 if (!leakable && (vt & VT_ARRAY) != 0) { 268 if (!leakable && (vt & VT_ARRAY) != 0) {
269 leakable = true; 269 leakable = true;
270 } 270 }
271 271
272 return leakable; 272 return leakable;
273 } 273 }
274 274
275 } // namespace win 275 } // namespace win
276 } // namespace base 276 } // namespace base
OLDNEW
« no previous file with comments | « base/win/scoped_comptr.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698