Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add some #if[n]def STASTANDALONE_STRING_TESTS r=scc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@64091 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pavlov%netscape.com
2000-03-25 02:07:34 +00:00
parent 550e39bc3f
commit 39ea807596
8 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/string/obsolete/nsString.h
View File

@@ -337,9 +337,10 @@ public:
/**********************************************************************
string conversion methods...
*********************************************************************/
operator char*() {return mStr;}
operator const char*() const {return (const char*)mStr;}
#ifndef STASTANDALONE_STRING_TESTS
operator char*() {return mStr;}
operator const char*() const {return (const char*)mStr;}
#endif
/**
* This method constructs a new nsCString that is a clone
@@ -744,7 +745,9 @@ public:
};
#ifdef NEW_STRING_APIS
#ifndef STASTANDALONE_STRING_TESTS
NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const nsCString&, const nsCString&);
#endif
NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const nsCString&, const char*)
NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const char*, const nsCString&)
#endif

2
mozilla/string/public/nsAReadableString.h
View File

@@ -1069,7 +1069,7 @@ operator+( const basic_nsLiteralString<CharT>& lhs, const basic_nsLiteralString<
#if 0
#ifdef SCC_TESTS
#ifdef STANDALONE_STRING_TESTS
template <class CharT, class TraitsT>
basic_ostream<CharT, TraitsT>&
operator<<( basic_ostream<CharT, TraitsT>& os, const basic_nsAReadableString<CharT>& s )

6
mozilla/xpcom/ds/bufferRoutines.h
View File

@@ -36,7 +36,7 @@
#include "nsCRT.h"
#ifndef RICKG_TESTBED
#if !defined(RICKG_TESTBED) && !defined(STANDALONE_STRING_TESTS)
#include "nsUnicharUtilCIID.h"
#include "nsIServiceManager.h"
#include "nsICaseConversion.h"
@@ -704,7 +704,7 @@ PRInt32 ConvertCase1(char* aString,PRUint32 aCount,PRBool aToUpper){
//----------------------------------------------------------------------------------------
#ifndef RICKG_TESTBED
#if !defined(RICKG_TESTBED) && !defined(STANDALONE_STRING_TESTS)
class HandleCaseConversionShutdown3 : public nsIShutdownListener {
public :
NS_IMETHOD OnShutdown(const nsCID& cid, nsISupports* service);
@@ -759,7 +759,7 @@ PRInt32 ConvertCase2(char* aString,PRUint32 aCount,PRBool aToUpper){
PRUnichar* end = cp + aCount-1;
PRInt32 result=0;
#ifndef RICKG_TESTBED
#if !defined(RICKG_TESTBED) && !defined(STANDALONE_STRING_TESTS)
static CCaseConversionServiceInitializer gCaseConversionServiceInitializer;
// I18N code begin

2
mozilla/xpcom/ds/nsAReadableString.h
View File

@@ -1069,7 +1069,7 @@ operator+( const basic_nsLiteralString<CharT>& lhs, const basic_nsLiteralString<
#if 0
#ifdef SCC_TESTS
#ifdef STANDALONE_STRING_TESTS
template <class CharT, class TraitsT>
basic_ostream<CharT, TraitsT>&
operator<<( basic_ostream<CharT, TraitsT>& os, const basic_nsAReadableString<CharT>& s )

4
mozilla/xpcom/ds/nsCRT.cpp
View File

@@ -126,13 +126,13 @@ static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
extern nsICaseConversion * gCaseConv;
#ifdef SCC_TESTS
#ifdef STANDALONE_STRING_TESTS
static nsICaseConversion* gCaseConv;
#endif
static void CheckCaseConversion()
{
#ifndef SCC_TESTS
#ifndef STANDALONE_STRING_TESTS
if (NULL == gCaseConv)
(void) nsServiceManager::GetService(kUnicharUtilCID, NS_GET_IID(nsICaseConversion),
(nsISupports**) &gCaseConv);

9
mozilla/xpcom/ds/nsString.h
View File

@@ -337,9 +337,10 @@ public:
/**********************************************************************
string conversion methods...
*********************************************************************/
operator char*() {return mStr;}
operator const char*() const {return (const char*)mStr;}
#ifndef STASTANDALONE_STRING_TESTS
operator char*() {return mStr;}
operator const char*() const {return (const char*)mStr;}
#endif
/**
* This method constructs a new nsCString that is a clone
@@ -744,7 +745,9 @@ public:
};
#ifdef NEW_STRING_APIS
#ifndef STASTANDALONE_STRING_TESTS
NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const nsCString&, const nsCString&);
#endif
NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const nsCString&, const char*)
NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const char*, const nsCString&)
#endif

9
mozilla/xpcom/string/obsolete/nsString.h
View File

@@ -337,9 +337,10 @@ public:
/**********************************************************************
string conversion methods...
*********************************************************************/
operator char*() {return mStr;}
operator const char*() const {return (const char*)mStr;}
#ifndef STASTANDALONE_STRING_TESTS
operator char*() {return mStr;}
operator const char*() const {return (const char*)mStr;}
#endif
/**
* This method constructs a new nsCString that is a clone
@@ -744,7 +745,9 @@ public:
};
#ifdef NEW_STRING_APIS
#ifndef STASTANDALONE_STRING_TESTS
NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const nsCString&, const nsCString&);
#endif
NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const nsCString&, const char*)
NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const char*, const nsCString&)
#endif

2
mozilla/xpcom/string/public/nsAReadableString.h
View File

@@ -1069,7 +1069,7 @@ operator+( const basic_nsLiteralString<CharT>& lhs, const basic_nsLiteralString<
#if 0
#ifdef SCC_TESTS
#ifdef STANDALONE_STRING_TESTS
template <class CharT, class TraitsT>
basic_ostream<CharT, TraitsT>&
operator<<( basic_ostream<CharT, TraitsT>& os, const basic_nsAReadableString<CharT>& s )