From 0669aa2ebf176c0ddee2930876646219e78a8976 Mon Sep 17 00:00:00 2001 From: "bruce%cybersight.com" Date: Fri, 7 May 1999 08:08:21 +0000 Subject: [PATCH] This MUST be fixed in some other way. This is a temporary fix for the HP build bustage that Warren okayed as this code isn't in use elsewhere. This is just commenting out the bad code, not fixing it. git-svn-id: svn://10.0.0.236/trunk@30686 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/base/src/nsVariant.cpp | 5 ++++- mozilla/xpcom/ds/nsVariant.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mozilla/base/src/nsVariant.cpp b/mozilla/base/src/nsVariant.cpp index 3ae233fd259..b74a0c4b08f 100644 --- a/mozilla/base/src/nsVariant.cpp +++ b/mozilla/base/src/nsVariant.cpp @@ -56,7 +56,10 @@ nsVariant::~nsVariant() { switch (mType) { case nsVariantType_voidPtr: - delete (void *)mValue; + /* XXX: Per comments from Warren, commenting this out. + This code isn't done (or used), and is a violation + of ANSI C++ to boot. -- Bruce */ + /* delete (void *)mValue; */ break; case nsVariantType_charPtr: nsCRT::free(mValue.mUnion._charPtr); diff --git a/mozilla/xpcom/ds/nsVariant.cpp b/mozilla/xpcom/ds/nsVariant.cpp index 3ae233fd259..b74a0c4b08f 100644 --- a/mozilla/xpcom/ds/nsVariant.cpp +++ b/mozilla/xpcom/ds/nsVariant.cpp @@ -56,7 +56,10 @@ nsVariant::~nsVariant() { switch (mType) { case nsVariantType_voidPtr: - delete (void *)mValue; + /* XXX: Per comments from Warren, commenting this out. + This code isn't done (or used), and is a violation + of ANSI C++ to boot. -- Bruce */ + /* delete (void *)mValue; */ break; case nsVariantType_charPtr: nsCRT::free(mValue.mUnion._charPtr);