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/llxml | |
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/llxml')
-rwxr-xr-x | indra/llxml/llcontrol.cpp | 4 | ||||
-rwxr-xr-x | indra/llxml/tests/llcontrol_test.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp index 079545d31f..4e3d0ab392 100755 --- a/indra/llxml/llcontrol.cpp +++ b/indra/llxml/llcontrol.cpp @@ -832,7 +832,7 @@ U32 LLControlGroup::saveToFile(const std::string& filename, BOOL nondefault_only ++num_saved; } } - std::ofstream file; + llofstream file; file.open(filename.c_str()); if (file.is_open()) { @@ -852,7 +852,7 @@ U32 LLControlGroup::saveToFile(const std::string& filename, BOOL nondefault_only U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_values, bool save_values) { LLSD settings; - std::ifstream infile; + llifstream infile; infile.open(filename.c_str()); if(!infile.is_open()) { diff --git a/indra/llxml/tests/llcontrol_test.cpp b/indra/llxml/tests/llcontrol_test.cpp index bc17a88f7c..2b691ffbb1 100755 --- a/indra/llxml/tests/llcontrol_test.cpp +++ b/indra/llxml/tests/llcontrol_test.cpp @@ -80,7 +80,7 @@ namespace tut } void writeSettingsFile(const LLSD& config) { - std::ofstream file(mTestConfigFile.c_str()); + llofstream file(mTestConfigFile.c_str()); if (file.is_open()) { LLSDSerialize::toPrettyXML(config, file); |