diff options
author | Oz Linden <oz@lindenlab.com> | 2015-04-07 17:28:05 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-04-07 17:28:05 -0400 |
commit | 3a57b18896eacb6fea6680d0eccaaeddb0b700b0 (patch) | |
tree | 70ca4bccbb2fe28ab5232d920a94fd0246f1b8ad /indra/llxml | |
parent | 66bc5107863e8226e91818cd9d3c075d0514dbe5 (diff) |
convert llifstream and llofstream to std::ifstream and std::ofstream respectively
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 598a802d67..4e3d0ab392 100755 --- a/indra/llxml/llcontrol.cpp +++ b/indra/llxml/llcontrol.cpp @@ -833,7 +833,7 @@ U32 LLControlGroup::saveToFile(const std::string& filename, BOOL nondefault_only } } llofstream file; - file.open(filename); + file.open(filename.c_str()); if (file.is_open()) { LLSDSerialize::toPrettyXML(settings, file); @@ -853,7 +853,7 @@ U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_v { LLSD settings; llifstream infile; - infile.open(filename); + infile.open(filename.c_str()); if(!infile.is_open()) { LL_WARNS("Settings") << "Cannot find file " << filename << " to load." << LL_ENDL; diff --git a/indra/llxml/tests/llcontrol_test.cpp b/indra/llxml/tests/llcontrol_test.cpp index c273773c9b..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) { - llofstream file(mTestConfigFile); + llofstream file(mTestConfigFile.c_str()); if (file.is_open()) { LLSDSerialize::toPrettyXML(config, file); |