summaryrefslogtreecommitdiff
path: root/indra/newview/llsechandler_basic.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-04-10 11:02:37 -0400
committerOz Linden <oz@lindenlab.com>2015-04-10 11:02:37 -0400
commit5c6cf3e7fb9f592e3a293921175b64b515bac23f (patch)
tree15933c1910c4b337e0c181434b6d653628f62eed /indra/newview/llsechandler_basic.cpp
parent6b9b4c91d122dccabf7541af70ed68a623ad8810 (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/newview/llsechandler_basic.cpp')
-rwxr-xr-xindra/newview/llsechandler_basic.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llsechandler_basic.cpp b/indra/newview/llsechandler_basic.cpp
index c904b95666..40516f9bbb 100755
--- a/indra/newview/llsechandler_basic.cpp
+++ b/indra/newview/llsechandler_basic.cpp
@@ -640,7 +640,7 @@ LLBasicCertificateStore::~LLBasicCertificateStore()
// persist the store
void LLBasicCertificateStore::save()
{
- std::ofstream file_store(mFilename.c_str(), std::ios_base::binary);
+ llofstream file_store(mFilename.c_str(), std::ios_base::binary);
if(!file_store.fail())
{
for(iterator cert = begin();
@@ -1245,8 +1245,8 @@ void LLSecAPIBasicHandler::_readProtectedData()
{
// attempt to load the file into our map
LLPointer<LLSDParser> parser = new LLSDXMLParser();
- std::ifstream protected_data_stream(mProtectedDataFilename.c_str(),
- std::ifstream::binary);
+ llifstream protected_data_stream(mProtectedDataFilename.c_str(),
+ llifstream::binary);
if (!protected_data_stream.fail()) {
U8 salt[STORE_SALT_SIZE];
@@ -1330,7 +1330,7 @@ void LLSecAPIBasicHandler::_writeProtectedData()
// an error.
std::string tmp_filename = mProtectedDataFilename + ".tmp";
- std::ofstream protected_data_stream(tmp_filename.c_str(),
+ llofstream protected_data_stream(tmp_filename.c_str(),
std::ios_base::binary);
try
{
@@ -1568,7 +1568,7 @@ std::string LLSecAPIBasicHandler::_legacyLoadPassword()
{
const S32 HASHED_LENGTH = 32;
std::vector<U8> buffer(HASHED_LENGTH);
- std::ifstream password_file(mLegacyPasswordPath.c_str(), std::ifstream::binary);
+ llifstream password_file(mLegacyPasswordPath.c_str(), llifstream::binary);
if(password_file.fail())
{