summaryrefslogtreecommitdiff
path: root/indra/llxml
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llxml')
-rwxr-xr-xindra/llxml/llcontrol.cpp4
-rwxr-xr-xindra/llxml/tests/llcontrol_test.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp
index 4e3d0ab392..079545d31f 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;
}
}
- llofstream file;
+ std::ofstream 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;
- llifstream infile;
+ std::ifstream 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 2b691ffbb1..bc17a88f7c 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.c_str());
+ std::ofstream file(mTestConfigFile.c_str());
if (file.is_open())
{
LLSDSerialize::toPrettyXML(config, file);