summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2019-12-13 16:03:26 +0100
committerAndras Timar <andras.timar@collabora.com>2019-12-13 16:03:26 +0100
commit141baf6f6a0242f3e21f37f8a8b3aea21d25448e (patch)
treeae104072b9218d51dcd6ca5bae02563c2c59ec4f
parent6e8ebc5f87e62a391cfca0429c6c4bea7f6ccbfb (diff)
fix error: declaration of ‘load’ shadows a member of 'this' [-Werror=shadow]CODE-4.2.0-1
Change-Id: I4bd4fb3ae6f01c0d03d622f90e1dfb872c396494
-rw-r--r--wsd/DocumentBroker.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 77204dd69..fecea32bc 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -2244,8 +2244,8 @@ bool ConvertToBroker::startConversion(SocketDisposition &disposition, const std:
// Load the document manually and request saving in the target format.
std::string encodedFrom;
Poco::URI::encode(docBroker->getPublicUri().getPath(), "", encodedFrom);
- const std::string load = "load url=" + encodedFrom;
- std::vector<char> loadRequest(load.begin(), load.end());
+ const std::string _load = "load url=" + encodedFrom;
+ std::vector<char> loadRequest(_load.begin(), _load.end());
docBroker->_clientSession->handleMessage(true, WSOpCode::Text, loadRequest);
// Save is done in the setLoaded