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

Side by Side Diff: base/win/scoped_propvariant.h

Issue 985853005: base: Remove operator& from ScopedVariant and ScopedPropVariant. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scoped-operator: ptr() Created 5 years, 9 months 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #ifndef BASE_WIN_SCOPED_PROPVARIANT_H_ 5 #ifndef BASE_WIN_SCOPED_PROPVARIANT_H_
6 #define BASE_WIN_SCOPED_PROPVARIANT_H_ 6 #define BASE_WIN_SCOPED_PROPVARIANT_H_
7 7
8 #include <propidl.h> 8 #include <propidl.h>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 24 matching lines...) Expand all
35 // Clears the instance to prepare it for re-use (e.g., via Receive). 35 // Clears the instance to prepare it for re-use (e.g., via Receive).
36 void Reset() { 36 void Reset() {
37 if (pv_.vt != VT_EMPTY) { 37 if (pv_.vt != VT_EMPTY) {
38 HRESULT result = PropVariantClear(&pv_); 38 HRESULT result = PropVariantClear(&pv_);
39 DCHECK_EQ(result, S_OK); 39 DCHECK_EQ(result, S_OK);
40 } 40 }
41 } 41 }
42 42
43 const PROPVARIANT& get() const { return pv_; } 43 const PROPVARIANT& get() const { return pv_; }
44 44
45 const PROPVARIANT* operator&() const { return &pv_; }
46
47 private: 45 private:
48 PROPVARIANT pv_; 46 PROPVARIANT pv_;
49 47
50 // Comparison operators for ScopedPropVariant are not supported at this point. 48 // Comparison operators for ScopedPropVariant are not supported at this point.
51 bool operator==(const ScopedPropVariant&) const; 49 bool operator==(const ScopedPropVariant&) const;
52 bool operator!=(const ScopedPropVariant&) const; 50 bool operator!=(const ScopedPropVariant&) const;
53 DISALLOW_COPY_AND_ASSIGN(ScopedPropVariant); 51 DISALLOW_COPY_AND_ASSIGN(ScopedPropVariant);
54 }; 52 };
55 53
56 } // namespace win 54 } // namespace win
57 } // namespace base 55 } // namespace base
58 56
59 #endif // BASE_WIN_SCOPED_PROPVARIANT_H_ 57 #endif // BASE_WIN_SCOPED_PROPVARIANT_H_
OLDNEW
« no previous file with comments | « no previous file | base/win/scoped_variant.h » ('j') | chrome/browser/importer/ie_importer_browsertest_win.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698