| Index: base/win/scoped_variant.h
|
| diff --git a/base/win/scoped_variant.h b/base/win/scoped_variant.h
|
| index b6e65798fbd03c1a51eaef77839797393c28f82c..322fcf71e5574725ed6d887be4e5c49605bdc6b1 100644
|
| --- a/base/win/scoped_variant.h
|
| +++ b/base/win/scoped_variant.h
|
| @@ -122,9 +122,7 @@ class BASE_EXPORT ScopedVariant {
|
| // This support is necessary for the V_XYZ (e.g. V_BSTR) set of macros to
|
| // work properly but still doesn't allow modifications since we want control
|
| // over that.
|
| - const VARIANT* operator&() const {
|
| - return &var_;
|
| - }
|
| + const VARIANT* ptr() const { return &var_; }
|
|
|
| // Like other scoped classes (e.g scoped_refptr, ScopedComPtr, ScopedBstr)
|
| // we support the assignment operator for the type we wrap.
|
| @@ -161,6 +159,6 @@ class BASE_EXPORT ScopedVariant {
|
| };
|
|
|
| } // namespace win
|
| -} // namesoace base
|
| +} // namespace base
|
|
|
| #endif // BASE_WIN_SCOPED_VARIANT_H_
|
|
|