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

Backing out bug 196506 and build fix attempt.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@139637 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
heikki%netscape.com
2003-03-18 01:58:15 +00:00
parent 1d9b23d398
commit ed7fdc29ae
6 changed files with 114 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
mozilla/xpcom/string/embed/nsEmbedString.cpp
View File

@@ -452,53 +452,3 @@ nsEmbedCString::GrowCapacity(size_type aNewCapacity)
return result;
}
// Copies of Distance() function (and things that it depends on) from
// ../src/nsReadableUtils.cpp. This is needed to make the non-inline
// constructors of nsDependentSubstring work in embed builds.
// See bug 196506
#ifndef nsReadableUtils_h___
template <class CharT> class CalculateLength
{
public:
typedef CharT value_type;
CalculateLength() : mDistance(0) { }
size_t GetDistance() const { return mDistance; }
PRUint32 write( const CharT*, PRUint32 N )
{ mDistance += N; return N; }
private:
size_t mDistance;
};
template <class CharT>
inline
size_t
Distance_Impl( const nsReadingIterator<CharT>& aStart,
const nsReadingIterator<CharT>& aEnd )
{
CalculateLength<CharT> sink;
nsReadingIterator<CharT> fromBegin(aStart);
copy_string(fromBegin, aEnd, sink);
return sink.GetDistance();
}
NS_COM
size_t
Distance( const nsAString::const_iterator& aStart, const nsAString::const_iterator& aEnd )
{
return Distance_Impl(aStart, aEnd);
}
NS_COM
size_t
Distance( const nsACString::const_iterator& aStart, const nsACString::const_iterator& aEnd )
{
return Distance_Impl(aStart, aEnd);
}
#endif // !defined(nsReadableUtils_h___)