From a351285602a7af344647c36a0411c0b117f485cb Mon Sep 17 00:00:00 2001 From: "scc%netscape.com" Date: Mon, 17 Apr 2000 12:22:37 +0000 Subject: [PATCH] fixing build bustage git-svn-id: svn://10.0.0.236/trunk@66197 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/string/obsolete/nsString.h | 12 ++++++------ mozilla/string/obsolete/nsString2.h | 10 +++++----- mozilla/xpcom/ds/nsString.h | 12 ++++++------ mozilla/xpcom/ds/nsString2.h | 10 +++++----- mozilla/xpcom/string/obsolete/nsString.h | 12 ++++++------ mozilla/xpcom/string/obsolete/nsString2.h | 10 +++++----- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/mozilla/string/obsolete/nsString.h b/mozilla/string/obsolete/nsString.h index 03fb430869b..b9bd339ef1e 100644 --- a/mozilla/string/obsolete/nsString.h +++ b/mozilla/string/obsolete/nsString.h @@ -425,8 +425,8 @@ public: * @param aString: string to be added to this * @return this */ - nsCString& operator=(PRUnichar aChar) {return Assign(aChar);} - nsCString& operator=(char aChar) {AssignWithConversion(aChar); return *this;} + nsCString& operator=(PRUnichar aChar) {AssignWithConversion(aChar); return *this;} + nsCString& operator=(char aChar) {return Assign(aChar);} nsCString& operator=(const PRUnichar* aString) {AssignWithConversion(aString); return *this;} nsCString& operator=(const nsCString& aString) {return Assign(aString);} @@ -775,10 +775,10 @@ public: private: // NOT TO BE IMPLEMENTED // these signatures help clients not accidentally call the wrong thing helped by C++ automatic integral promotion - void AssignWithConversion( char ) { } - void AssignWithConversion( const char*, PRInt32=-1 ) { } - void AppendWithConversion( char ) { } - void InsertWithConversion( char, PRUint32 ) { } + void AssignWithConversion( char ); + void AssignWithConversion( const char*, PRInt32=-1 ); + void AppendWithConversion( char ); + void InsertWithConversion( char, PRUint32 ); }; #if 0//def NEW_STRING_APIS diff --git a/mozilla/string/obsolete/nsString2.h b/mozilla/string/obsolete/nsString2.h index 4e0d313fa8a..bafcb690f3e 100644 --- a/mozilla/string/obsolete/nsString2.h +++ b/mozilla/string/obsolete/nsString2.h @@ -870,11 +870,11 @@ public: private: // NOT TO BE IMPLEMENTED // these signatures help clients not accidentally call the wrong thing helped by C++ automatic integral promotion - void AssignWithConversion( PRUnichar ) { } - void AssignWithConversion( const PRUnichar*, PRInt32=-1 ) { } - void AppendWithConversion( PRUnichar ) { } - void AppendWithConversion( const PRUnichar*, PRInt32=-1 ) { } - void InsertWithConversion( const PRUnichar*, PRUint32, PRInt32=-1 ) { } + void AssignWithConversion( PRUnichar ); + void AssignWithConversion( const PRUnichar*, PRInt32=-1 ); + void AppendWithConversion( PRUnichar ); + void AppendWithConversion( const PRUnichar*, PRInt32=-1 ); + void InsertWithConversion( const PRUnichar*, PRUint32, PRInt32=-1 ); }; #if 0//def NEW_STRING_APIS diff --git a/mozilla/xpcom/ds/nsString.h b/mozilla/xpcom/ds/nsString.h index 03fb430869b..b9bd339ef1e 100644 --- a/mozilla/xpcom/ds/nsString.h +++ b/mozilla/xpcom/ds/nsString.h @@ -425,8 +425,8 @@ public: * @param aString: string to be added to this * @return this */ - nsCString& operator=(PRUnichar aChar) {return Assign(aChar);} - nsCString& operator=(char aChar) {AssignWithConversion(aChar); return *this;} + nsCString& operator=(PRUnichar aChar) {AssignWithConversion(aChar); return *this;} + nsCString& operator=(char aChar) {return Assign(aChar);} nsCString& operator=(const PRUnichar* aString) {AssignWithConversion(aString); return *this;} nsCString& operator=(const nsCString& aString) {return Assign(aString);} @@ -775,10 +775,10 @@ public: private: // NOT TO BE IMPLEMENTED // these signatures help clients not accidentally call the wrong thing helped by C++ automatic integral promotion - void AssignWithConversion( char ) { } - void AssignWithConversion( const char*, PRInt32=-1 ) { } - void AppendWithConversion( char ) { } - void InsertWithConversion( char, PRUint32 ) { } + void AssignWithConversion( char ); + void AssignWithConversion( const char*, PRInt32=-1 ); + void AppendWithConversion( char ); + void InsertWithConversion( char, PRUint32 ); }; #if 0//def NEW_STRING_APIS diff --git a/mozilla/xpcom/ds/nsString2.h b/mozilla/xpcom/ds/nsString2.h index 4e0d313fa8a..bafcb690f3e 100644 --- a/mozilla/xpcom/ds/nsString2.h +++ b/mozilla/xpcom/ds/nsString2.h @@ -870,11 +870,11 @@ public: private: // NOT TO BE IMPLEMENTED // these signatures help clients not accidentally call the wrong thing helped by C++ automatic integral promotion - void AssignWithConversion( PRUnichar ) { } - void AssignWithConversion( const PRUnichar*, PRInt32=-1 ) { } - void AppendWithConversion( PRUnichar ) { } - void AppendWithConversion( const PRUnichar*, PRInt32=-1 ) { } - void InsertWithConversion( const PRUnichar*, PRUint32, PRInt32=-1 ) { } + void AssignWithConversion( PRUnichar ); + void AssignWithConversion( const PRUnichar*, PRInt32=-1 ); + void AppendWithConversion( PRUnichar ); + void AppendWithConversion( const PRUnichar*, PRInt32=-1 ); + void InsertWithConversion( const PRUnichar*, PRUint32, PRInt32=-1 ); }; #if 0//def NEW_STRING_APIS diff --git a/mozilla/xpcom/string/obsolete/nsString.h b/mozilla/xpcom/string/obsolete/nsString.h index 03fb430869b..b9bd339ef1e 100644 --- a/mozilla/xpcom/string/obsolete/nsString.h +++ b/mozilla/xpcom/string/obsolete/nsString.h @@ -425,8 +425,8 @@ public: * @param aString: string to be added to this * @return this */ - nsCString& operator=(PRUnichar aChar) {return Assign(aChar);} - nsCString& operator=(char aChar) {AssignWithConversion(aChar); return *this;} + nsCString& operator=(PRUnichar aChar) {AssignWithConversion(aChar); return *this;} + nsCString& operator=(char aChar) {return Assign(aChar);} nsCString& operator=(const PRUnichar* aString) {AssignWithConversion(aString); return *this;} nsCString& operator=(const nsCString& aString) {return Assign(aString);} @@ -775,10 +775,10 @@ public: private: // NOT TO BE IMPLEMENTED // these signatures help clients not accidentally call the wrong thing helped by C++ automatic integral promotion - void AssignWithConversion( char ) { } - void AssignWithConversion( const char*, PRInt32=-1 ) { } - void AppendWithConversion( char ) { } - void InsertWithConversion( char, PRUint32 ) { } + void AssignWithConversion( char ); + void AssignWithConversion( const char*, PRInt32=-1 ); + void AppendWithConversion( char ); + void InsertWithConversion( char, PRUint32 ); }; #if 0//def NEW_STRING_APIS diff --git a/mozilla/xpcom/string/obsolete/nsString2.h b/mozilla/xpcom/string/obsolete/nsString2.h index 4e0d313fa8a..bafcb690f3e 100644 --- a/mozilla/xpcom/string/obsolete/nsString2.h +++ b/mozilla/xpcom/string/obsolete/nsString2.h @@ -870,11 +870,11 @@ public: private: // NOT TO BE IMPLEMENTED // these signatures help clients not accidentally call the wrong thing helped by C++ automatic integral promotion - void AssignWithConversion( PRUnichar ) { } - void AssignWithConversion( const PRUnichar*, PRInt32=-1 ) { } - void AppendWithConversion( PRUnichar ) { } - void AppendWithConversion( const PRUnichar*, PRInt32=-1 ) { } - void InsertWithConversion( const PRUnichar*, PRUint32, PRInt32=-1 ) { } + void AssignWithConversion( PRUnichar ); + void AssignWithConversion( const PRUnichar*, PRInt32=-1 ); + void AppendWithConversion( PRUnichar ); + void AppendWithConversion( const PRUnichar*, PRInt32=-1 ); + void InsertWithConversion( const PRUnichar*, PRUint32, PRInt32=-1 ); }; #if 0//def NEW_STRING_APIS