From f70c7022278115fc5c929b589b7d85b24387becb Mon Sep 17 00:00:00 2001 From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com> Date: Fri, 30 Jan 2015 15:08:58 -0500 Subject: [PATCH] upnp: fix compiler warnings Refs #64935 Change-Id: I8293e184087a9b526c3ba4a3db12d875b8313306 --- daemon/src/upnp/upnp.cpp | 4 ++-- daemon/src/upnp/upnp.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon/src/upnp/upnp.cpp b/daemon/src/upnp/upnp.cpp index 70e246e492..f7ec85518d 100644 --- a/daemon/src/upnp/upnp.cpp +++ b/daemon/src/upnp/upnp.cpp @@ -133,9 +133,9 @@ bool operator!= (Mapping &cMap1, Mapping &cMap2) } Controller::Controller() - : udpGlobalMappings_(getGlobalInstance<UDPMapGlobal>()) + : defaultIGD_(getIGD()) + , udpGlobalMappings_(getGlobalInstance<UDPMapGlobal>()) , tcpGlobalMappings_(getGlobalInstance<TCPMapGlobal>()) - , defaultIGD_(getIGD()) {} Controller::~Controller() diff --git a/daemon/src/upnp/upnp.h b/daemon/src/upnp/upnp.h index dfd9d9259d..ca6ace1b7e 100644 --- a/daemon/src/upnp/upnp.h +++ b/daemon/src/upnp/upnp.h @@ -117,7 +117,7 @@ public: {}; /* move constructor and operator */ - Mapping(Mapping&& other) = default; + Mapping(Mapping&&) = default; Mapping& operator=(Mapping&&) = default; friend bool operator== (Mapping &cRedir1, Mapping &cRedir2); @@ -250,4 +250,4 @@ std::shared_ptr<IGD> getIGD(); }} // namespace ring::upnp -#endif /* UPNP_H_ */ \ No newline at end of file +#endif /* UPNP_H_ */ -- GitLab