From ec7d3e520a3b087ff62976ab570c0068e88b51eb Mon Sep 17 00:00:00 2001 From: "dougt%netscape.com" Date: Fri, 26 Feb 1999 00:14:57 +0000 Subject: [PATCH] Remove #ifdef DEBUG --- base/public/nsFileSpec.h | 4 ++-- base/src/nsFileSpec.cpp | 6 ++---- xpcom/io/nsFileSpec.cpp | 6 ++---- xpcom/io/nsFileSpec.h | 4 ++-- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/base/public/nsFileSpec.h b/base/public/nsFileSpec.h index 78c30012f0fd..6b07d8e0d0cb 100644 --- a/base/public/nsFileSpec.h +++ b/base/public/nsFileSpec.h @@ -230,12 +230,12 @@ class NS_BASE nsFileSpec PRBool Valid() const { return NS_SUCCEEDED(Error()); } nsresult Error() const { return mError; } -#if DEBUG + friend NS_BASE nsOutputStream& operator << ( nsOutputStream& s, const nsFileSpec& spec); // THIS IS FOR DEBUGGING ONLY. // see PersistentFileDescriptor for the real deal. -#endif + //-------------------------------------------------- // Queries and path algebra. These do not modify the disk. diff --git a/base/src/nsFileSpec.cpp b/base/src/nsFileSpec.cpp index 07a1ca0c51b9..079d4883e846 100644 --- a/base/src/nsFileSpec.cpp +++ b/base/src/nsFileSpec.cpp @@ -367,14 +367,13 @@ void nsFileURL::operator = (const nsFileSpec& inOther) #endif } // nsFileURL::operator = -#if DEBUG + //---------------------------------------------------------------------------------------- nsOutputStream& operator << (nsOutputStream& s, const nsFileURL& url) //---------------------------------------------------------------------------------------- { return (s << url.mURL); } -#endif //======================================================================================== // nsFilePath implementation @@ -673,7 +672,7 @@ void nsFileSpec::operator = (const char* inString) } #endif //XP_UNIX -#if DEBUG + #if (defined(XP_UNIX) || defined(XP_PC)) //---------------------------------------------------------------------------------------- nsOutputStream& operator << (nsOutputStream& s, const nsFileSpec& spec) @@ -682,7 +681,6 @@ nsOutputStream& operator << (nsOutputStream& s, const nsFileSpec& spec) return (s << (const char*)spec.mPath); } #endif // DEBUG && XP_UNIX -#endif //---------------------------------------------------------------------------------------- nsFileSpec nsFileSpec::operator + (const char* inRelativePath) const diff --git a/xpcom/io/nsFileSpec.cpp b/xpcom/io/nsFileSpec.cpp index 07a1ca0c51b9..079d4883e846 100644 --- a/xpcom/io/nsFileSpec.cpp +++ b/xpcom/io/nsFileSpec.cpp @@ -367,14 +367,13 @@ void nsFileURL::operator = (const nsFileSpec& inOther) #endif } // nsFileURL::operator = -#if DEBUG + //---------------------------------------------------------------------------------------- nsOutputStream& operator << (nsOutputStream& s, const nsFileURL& url) //---------------------------------------------------------------------------------------- { return (s << url.mURL); } -#endif //======================================================================================== // nsFilePath implementation @@ -673,7 +672,7 @@ void nsFileSpec::operator = (const char* inString) } #endif //XP_UNIX -#if DEBUG + #if (defined(XP_UNIX) || defined(XP_PC)) //---------------------------------------------------------------------------------------- nsOutputStream& operator << (nsOutputStream& s, const nsFileSpec& spec) @@ -682,7 +681,6 @@ nsOutputStream& operator << (nsOutputStream& s, const nsFileSpec& spec) return (s << (const char*)spec.mPath); } #endif // DEBUG && XP_UNIX -#endif //---------------------------------------------------------------------------------------- nsFileSpec nsFileSpec::operator + (const char* inRelativePath) const diff --git a/xpcom/io/nsFileSpec.h b/xpcom/io/nsFileSpec.h index 78c30012f0fd..6b07d8e0d0cb 100644 --- a/xpcom/io/nsFileSpec.h +++ b/xpcom/io/nsFileSpec.h @@ -230,12 +230,12 @@ class NS_BASE nsFileSpec PRBool Valid() const { return NS_SUCCEEDED(Error()); } nsresult Error() const { return mError; } -#if DEBUG + friend NS_BASE nsOutputStream& operator << ( nsOutputStream& s, const nsFileSpec& spec); // THIS IS FOR DEBUGGING ONLY. // see PersistentFileDescriptor for the real deal. -#endif + //-------------------------------------------------- // Queries and path algebra. These do not modify the disk.