| Index: base/win/scoped_hglobal.h
|
| diff --git a/base/win/scoped_hglobal.h b/base/win/scoped_hglobal.h
|
| index 891e6cdfc87b14e8f9bcc77f55dc961928aeeb3a..185ccbd5f0cf017960df480e9f2d5f855f01294b 100644
|
| --- a/base/win/scoped_hglobal.h
|
| +++ b/base/win/scoped_hglobal.h
|
| @@ -17,23 +17,23 @@ template<class T>
|
| class ScopedHGlobal {
|
| public:
|
| explicit ScopedHGlobal(HGLOBAL glob) : glob_(glob) {
|
| - data_ = static_cast<T*>(GlobalLock(glob_));
|
| + data_ = static_cast<T>(GlobalLock(glob_));
|
| }
|
| ~ScopedHGlobal() {
|
| GlobalUnlock(glob_);
|
| }
|
|
|
| - T* get() { return data_; }
|
| + T get() { return data_; }
|
|
|
| size_t Size() const { return GlobalSize(glob_); }
|
|
|
| - T* operator->() const {
|
| + T operator->() const {
|
| assert(data_ != 0);
|
| return data_;
|
| }
|
|
|
| - T* release() {
|
| - T* data = data_;
|
| + T release() {
|
| + T data = data_;
|
| data_ = NULL;
|
| return data;
|
| }
|
| @@ -41,7 +41,7 @@ class ScopedHGlobal {
|
| private:
|
| HGLOBAL glob_;
|
|
|
| - T* data_;
|
| + T data_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ScopedHGlobal);
|
| };
|
|
|