diff options
author | callum_linden <none@none> | 2014-10-17 13:05:04 -0700 |
---|---|---|
committer | callum_linden <none@none> | 2014-10-17 13:05:04 -0700 |
commit | aca7976b8770aa7464bdba717d508372732f0e39 (patch) | |
tree | 17f181f814c7d693152356d3c92e8c7c2c5c11c2 /indra/llcommon | |
parent | f45b809bd7f0b9afb4d530ec0acb2d06eaafe41b (diff) |
Update to build on Xcode 6.0: turn BACK ON warnings as errors for overloaded virtuals [-Woverloaded-virtual] and fix up first (of many) files
Diffstat (limited to 'indra/llcommon')
-rwxr-xr-x | indra/llcommon/llfile.cpp | 2 | ||||
-rwxr-xr-x | indra/llcommon/llfile.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llfile.cpp b/indra/llcommon/llfile.cpp index 259187c52f..aabc195ba8 100755 --- a/indra/llcommon/llfile.cpp +++ b/indra/llcommon/llfile.cpp @@ -807,7 +807,7 @@ std::streamsize llstdio_filebuf::xsgetn(char_type* __s, std::streamsize __n) return __ret; } -std::streamsize llstdio_filebuf::xsputn(char_type* __s, std::streamsize __n) +std::streamsize llstdio_filebuf::xsputn(const char_type* __s, std::streamsize __n) { // Optimization in the always_noconv() case, to be generalized in the // future: when __n is sufficiently large we write directly instead of diff --git a/indra/llcommon/llfile.h b/indra/llcommon/llfile.h index f56b22bf9a..0612071d67 100755 --- a/indra/llcommon/llfile.h +++ b/indra/llcommon/llfile.h @@ -188,7 +188,7 @@ protected: /*virtual*/ int sync(); std::streamsize xsgetn(char_type*, std::streamsize); - std::streamsize xsputn(char_type*, std::streamsize); + std::streamsize xsputn(const char_type*, std::streamsize); #endif }; |