summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-23 22:10:38 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-23 22:10:38 +0000
commit1d437b64e1aaf11827962de62694bcb806265d00 (patch)
tree6868f323556a0534a0002bd9ff26033baee77762
parenta8111ce7343d3d6458eff4a5f370cf611f6753b4 (diff)
downloadchromium_src-1d437b64e1aaf11827962de62694bcb806265d00.zip
chromium_src-1d437b64e1aaf11827962de62694bcb806265d00.tar.gz
chromium_src-1d437b64e1aaf11827962de62694bcb806265d00.tar.bz2
Fixing problem with ScopedVariant in official builds.
BUG=9197 TBR=jon Review URL: http://codereview.chromium.org/47007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12318 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/scoped_variant_win.cc2
-rw-r--r--base/scoped_variant_win.h3
2 files changed, 1 insertions, 4 deletions
diff --git a/base/scoped_variant_win.cc b/base/scoped_variant_win.cc
index cc66c12..5653520 100644
--- a/base/scoped_variant_win.cc
+++ b/base/scoped_variant_win.cc
@@ -187,7 +187,6 @@ void ScopedVariant::Set(SAFEARRAY* array) {
}
}
-#ifndef OFFICIAL_BUILD
bool ScopedVariant::IsLeakableVarType(VARTYPE vt) {
bool leakable = false;
switch (vt & VT_TYPEMASK) {
@@ -227,4 +226,3 @@ bool ScopedVariant::IsLeakableVarType(VARTYPE vt) {
return leakable;
}
-#endif
diff --git a/base/scoped_variant_win.h b/base/scoped_variant_win.h
index 3526f79..50c9ce3 100644
--- a/base/scoped_variant_win.h
+++ b/base/scoped_variant_win.h
@@ -118,9 +118,8 @@ class ScopedVariant {
return var_;
}
-#ifndef OFFICIAL_BUILD
+ // Used as a debug check to see if we're leaking anything.
static bool IsLeakableVarType(VARTYPE vt);
-#endif
protected:
VARIANT var_;