Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More windows tweaks

Browse Source
This commit is contained in:
mcmullen%netscape.com 1998-12-11 23:05:24 +00:00
parent d22b37ac06
commit c35cd6f254
4 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
base/public/nsFileStream.h
View File

@ -367,9 +367,9 @@ nsFileBufferT<charT, traits>::int_type nsFileBufferT<charT, traits>::overflow(in
//----------------------------------------------------------------------------------------
{
#ifdef NS_EXPLICIT_FUNC_TEMPLATE_ARG
const ofacet_type& ft=use_facet<ofacet_type>(loc);
const ofacet_type& ft=use_facet<ofacet_type>(getloc());
#else
const ofacet_type& ft=use_facet(loc, (ofacet_type*)0);
const ofacet_type& ft=use_facet(getloc(), (ofacet_type*)0);
#endif
char_type ch = traits_type::to_char_type(c);
if (!mFileDesc)
@ -424,7 +424,7 @@ streamsize nsFileBufferT<charT, traits>::xsputn(const char_type* s, streamsize n
#ifdef NS_EXPLICIT_FUNC_TEMPLATE_ARG
const ofacet_type& ft=use_facet<ofacet_type>(loc);
#else
const ofacet_type& ft=use_facet(loc, (ofacet_type*)0);
const ofacet_type& ft=use_facet(getloc(), (ofacet_type*)0);
#endif
if (!mFileDesc || !n)
return 0;
@ -440,10 +440,10 @@ streamsize nsFileBufferT<charT, traits>::xsputn(const char_type* s, streamsize n
char* ebuf;
result conv;
#ifdef NS_EXPLICIT_FUNC_TEMPLATE_ARG
if ((conv=use_facet<ofacet_type>(loc).
if ((conv=use_facet<ofacet_type>(getloc()).
out(fst, s, s+n, end, buf, buf+7, ebuf))==codecvt_base::noconv)
#else
if ((conv=use_facet(loc, (ofacet_type*)0).
if ((conv=use_facet(getloc(), (ofacet_type*)0).
out(fst, s, s+n, end, buf, buf+7, ebuf))==codecvt_base::noconv)
#endif
return (streamsize)PR_Write(mFileDesc, s, sizeof(char) * size_t(n));
@ -495,12 +495,16 @@ template<class charT, class traits>
inline void nsFileBufferT<charT, traits>::imbue(const locale& loc_arg)
//----------------------------------------------------------------------------------------
{
loc = loc_arg;
#ifdef XP_MAC
loc = loc_arg;
#endif
}
//----------------------------------------------------------------------------------------
template<class charT, class traits>
inline streamsize
nsFileBufferT<charT, traits>::showmanyc()
//----------------------------------------------------------------------------------------
{
return (streamsize)PR_Available(mFileDesc);
}

9
base/tests/FilesTest.cpp
View File

@ -1,8 +1,13 @@
#include "nsFileSpec.h"
#include <iostream.h>
#include "nsFileStream.h"
#ifdef NS_USING_NAMESPACE
#include <iostream>
using namespace std;
#else
#include <iostream.h>
#endif
NS_NAMESPACE FileTest
{
void WriteStuff(ostream& s);

16
xpcom/io/nsFileStream.h
View File

@ -367,9 +367,9 @@ nsFileBufferT<charT, traits>::int_type nsFileBufferT<charT, traits>::overflow(in
//----------------------------------------------------------------------------------------
{
#ifdef NS_EXPLICIT_FUNC_TEMPLATE_ARG
const ofacet_type& ft=use_facet<ofacet_type>(loc);
const ofacet_type& ft=use_facet<ofacet_type>(getloc());
#else
const ofacet_type& ft=use_facet(loc, (ofacet_type*)0);
const ofacet_type& ft=use_facet(getloc(), (ofacet_type*)0);
#endif
char_type ch = traits_type::to_char_type(c);
if (!mFileDesc)
@ -424,7 +424,7 @@ streamsize nsFileBufferT<charT, traits>::xsputn(const char_type* s, streamsize n
#ifdef NS_EXPLICIT_FUNC_TEMPLATE_ARG
const ofacet_type& ft=use_facet<ofacet_type>(loc);
#else
const ofacet_type& ft=use_facet(loc, (ofacet_type*)0);
const ofacet_type& ft=use_facet(getloc(), (ofacet_type*)0);
#endif
if (!mFileDesc || !n)
return 0;
@ -440,10 +440,10 @@ streamsize nsFileBufferT<charT, traits>::xsputn(const char_type* s, streamsize n
char* ebuf;
result conv;
#ifdef NS_EXPLICIT_FUNC_TEMPLATE_ARG
if ((conv=use_facet<ofacet_type>(loc).
if ((conv=use_facet<ofacet_type>(getloc()).
out(fst, s, s+n, end, buf, buf+7, ebuf))==codecvt_base::noconv)
#else
if ((conv=use_facet(loc, (ofacet_type*)0).
if ((conv=use_facet(getloc(), (ofacet_type*)0).
out(fst, s, s+n, end, buf, buf+7, ebuf))==codecvt_base::noconv)
#endif
return (streamsize)PR_Write(mFileDesc, s, sizeof(char) * size_t(n));
@ -495,12 +495,16 @@ template<class charT, class traits>
inline void nsFileBufferT<charT, traits>::imbue(const locale& loc_arg)
//----------------------------------------------------------------------------------------
{
loc = loc_arg;
#ifdef XP_MAC
loc = loc_arg;
#endif
}
//----------------------------------------------------------------------------------------
template<class charT, class traits>
inline streamsize
nsFileBufferT<charT, traits>::showmanyc()
//----------------------------------------------------------------------------------------
{
return (streamsize)PR_Available(mFileDesc);
}

9
xpcom/tests/FilesTest.cpp
View File

@ -1,8 +1,13 @@
#include "nsFileSpec.h"
#include <iostream.h>
#include "nsFileStream.h"
#ifdef NS_USING_NAMESPACE
#include <iostream>
using namespace std;
#else
#include <iostream.h>
#endif
NS_NAMESPACE FileTest
{
void WriteStuff(ostream& s);