summaryrefslogtreecommitdiff
path: root/src/utils/xml
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-03-29 18:31:00 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-29 18:31:00 +0300
commit7132f71cf010e4f13eb27c1a24d8878aa984b43f (patch)
tree330ad08a5ae15d0f4dc2d13461de1d5a47a69fe6 /src/utils/xml
parentd9c0d1c3b2800b0c995393426b65a031203ca2f0 (diff)
downloadmv-7132f71cf010e4f13eb27c1a24d8878aa984b43f.tar.gz
mv-7132f71cf010e4f13eb27c1a24d8878aa984b43f.tar.bz2
mv-7132f71cf010e4f13eb27c1a24d8878aa984b43f.tar.xz
mv-7132f71cf010e4f13eb27c1a24d8878aa984b43f.zip
Remove extra memory copy in VirtFs::loadFile.
Also add const into VirtFs::loadFile.
Diffstat (limited to 'src/utils/xml')
-rw-r--r--src/utils/xml/libxml.cpp4
-rw-r--r--src/utils/xml/pugixml.cpp4
-rw-r--r--src/utils/xml/tinyxml2.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/utils/xml/libxml.cpp b/src/utils/xml/libxml.cpp
index ccb3aca39..f7319f7ee 100644
--- a/src/utils/xml/libxml.cpp
+++ b/src/utils/xml/libxml.cpp
@@ -98,9 +98,9 @@ namespace XML
valid = true;
if (useResman == UseVirtFs_true)
{
- data = VirtFs::loadFile(
+ data = const_cast<char*>(VirtFs::loadFile(
filename.c_str(),
- size);
+ size));
}
else
{
diff --git a/src/utils/xml/pugixml.cpp b/src/utils/xml/pugixml.cpp
index 1b5a3278e..7ad2779cd 100644
--- a/src/utils/xml/pugixml.cpp
+++ b/src/utils/xml/pugixml.cpp
@@ -76,9 +76,9 @@ namespace XML
valid = true;
if (useResman == UseVirtFs_true)
{
- data = VirtFs::loadFile(
+ data = const_cast<char*>(VirtFs::loadFile(
filename.c_str(),
- size);
+ size));
}
else
{
diff --git a/src/utils/xml/tinyxml2.cpp b/src/utils/xml/tinyxml2.cpp
index c88930828..214d08f42 100644
--- a/src/utils/xml/tinyxml2.cpp
+++ b/src/utils/xml/tinyxml2.cpp
@@ -68,9 +68,9 @@ namespace XML
valid = true;
if (useResman == UseVirtFs_true)
{
- data = VirtFs::loadFile(
+ data = const_cast<char*>(VirtFs::loadFile(
filename.c_str(),
- size);
+ size));
}
else
{