summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2019-10-18 13:49:05 +0100
committerPeter Powell <petpow@saberuk.com>2019-10-18 13:49:05 +0100
commit6049a8bdf3df798ee9ec0c18ca47261e347cc420 (patch)
tree5cef2a97e647150de53c8797fa4b2c0196e549c3 /src
parentc61a37790d08d75f5c355487442865999afbf309 (diff)
Fix a shadowing warning in the serialisation code.
Diffstat (limited to 'src')
-rw-r--r--src/serializable.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/serializable.cpp b/src/serializable.cpp
index 1d8a794d3..fc19b1979 100644
--- a/src/serializable.cpp
+++ b/src/serializable.cpp
@@ -126,9 +126,9 @@ bool User::Deserialize(Serializable::Data& data)
}
// Deserialize the extensions first.
- Serializable::Data extensions;
- data.Load("extensions", extensions);
- if (!Extensible::Deserialize(extensions))
+ Serializable::Data exts;
+ data.Load("extensions", exts);
+ if (!Extensible::Deserialize(exts))
return false;
long client_port;
@@ -186,10 +186,10 @@ bool User::Serialize(Serializable::Data& data)
return false;
// Serialize the extensions first.
- Serializable::Data extensions;
- if (!Extensible::Serialize(extensions))
+ Serializable::Data exts;
+ if (!Extensible::Serialize(exts))
return false;
- data.Store("extensions", extensions);
+ data.Store("extensions", exts);
// The following member variables not checked above are not serialised:
// * cached_fullhost (serialising cache variables is unnecessary)