diff options
author | Oz Linden <oz@lindenlab.com> | 2015-04-10 11:02:37 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-04-10 11:02:37 -0400 |
commit | 5c6cf3e7fb9f592e3a293921175b64b515bac23f (patch) | |
tree | 15933c1910c4b337e0c181434b6d653628f62eed /indra/llmessage | |
parent | 6b9b4c91d122dccabf7541af70ed68a623ad8810 (diff) |
restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes
Diffstat (limited to 'indra/llmessage')
-rwxr-xr-x | indra/llmessage/llhttpclient.cpp | 2 | ||||
-rwxr-xr-x | indra/llmessage/llmessageconfig.cpp | 2 | ||||
-rwxr-xr-x | indra/llmessage/llservicebuilder.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp index a36b3ff3c8..f8db3dded2 100755 --- a/indra/llmessage/llhttpclient.cpp +++ b/indra/llmessage/llhttpclient.cpp @@ -157,7 +157,7 @@ namespace { LLBufferStream ostream(channels, buffer.get()); - std::ifstream fstream(mFilename.c_str(), std::iostream::binary | std::iostream::out); + llifstream fstream(mFilename.c_str(), std::iostream::binary | std::iostream::out); if(fstream.is_open()) { fstream.seekg(0, std::ios::end); diff --git a/indra/llmessage/llmessageconfig.cpp b/indra/llmessage/llmessageconfig.cpp index e91051b73e..64e79d6767 100755 --- a/indra/llmessage/llmessageconfig.cpp +++ b/indra/llmessage/llmessageconfig.cpp @@ -96,7 +96,7 @@ bool LLMessageConfigFile::loadFile() { LLSD data; { - std::ifstream file(filename().c_str()); + llifstream file(filename().c_str()); if (file.is_open()) { diff --git a/indra/llmessage/llservicebuilder.cpp b/indra/llmessage/llservicebuilder.cpp index 34ab891830..cf2e42f95c 100755 --- a/indra/llmessage/llservicebuilder.cpp +++ b/indra/llmessage/llservicebuilder.cpp @@ -34,7 +34,7 @@ void LLServiceBuilder::loadServiceDefinitionsFromFile( const std::string& service_filename) { - std::ifstream service_file(service_filename.c_str(), std::ios::binary); + llifstream service_file(service_filename.c_str(), std::ios::binary); if(service_file.is_open()) { LLSD service_data; |