C++11 mapping server side input parameter fixes

1 files changed, 11 insertions, 11 deletions

diff --git a/cpp/src/IceDiscovery/LookupI.h b/cpp/src/IceDiscovery/LookupI.h
index b54875ff0f2..7e603ef8688 100644
--- a/cpp/src/IceDiscovery/LookupI.h
+++ b/cpp/src/IceDiscovery/LookupI.h
@@ -29,8 +29,8 @@ template<class T> class Request :
     public std::enable_shared_from_this<Request<T>>
 {
 public:
-    
-    Request(std::shared_ptr<LookupI> lookup, const T& id, int retryCount) : 
+
+    Request(std::shared_ptr<LookupI> lookup, const T& id, int retryCount) :
         _lookup(lookup),
         _id(id),
         _nRetry(retryCount)
@@ -41,7 +41,7 @@ public:
     {
         return _id;
     }
-    
+
     virtual bool retry()
     {
         return --_nRetry >= 0;
@@ -55,7 +55,7 @@ public:
 
     virtual void finished(const Ice::ObjectPrxPtr& proxy)
     {
-        for(auto cb : _callbacks) 
+        for(auto cb : _callbacks)
         {
             cb(proxy);
         }
@@ -74,7 +74,7 @@ class ObjectRequest : public Request<Ice::Identity>
 {
 public:
 
-    ObjectRequest(const std::shared_ptr<LookupI>& lookup, const Ice::Identity& id, int retryCount) : 
+    ObjectRequest(const std::shared_ptr<LookupI>& lookup, const Ice::Identity& id, int retryCount) :
         Request<Ice::Identity>(lookup, id, retryCount)
     {
     }
@@ -91,7 +91,7 @@ class AdapterRequest : public Request<std::string>
 {
 public:
 
-    AdapterRequest(std::shared_ptr<LookupI> lookup, const std::string& adapterId, int retryCount) : 
+    AdapterRequest(std::shared_ptr<LookupI> lookup, const std::string& adapterId, int retryCount) :
         Request<std::string>(lookup, adapterId, retryCount),
         _start(IceUtil::Time::now())
     {
@@ -130,7 +130,7 @@ protected:
 template<class T, class CB> class RequestT : public Request
 {
 public:
-    
+
     RequestT(LookupI* lookup, T id, int retryCount) : Request(lookup, retryCount), _id(id)
     {
     }
@@ -165,7 +165,7 @@ class ObjectRequest : public RequestT<Ice::Identity, Ice::AMD_Locator_findObject
 {
 public:
 
-    ObjectRequest(LookupI* lookup, const Ice::Identity& id, int retryCount) : 
+    ObjectRequest(LookupI* lookup, const Ice::Identity& id, int retryCount) :
         RequestT<Ice::Identity, Ice::AMD_Locator_findObjectByIdPtr>(lookup, id, retryCount)
     {
     }
@@ -182,7 +182,7 @@ class AdapterRequest : public RequestT<std::string, Ice::AMD_Locator_findAdapter
 {
 public:
 
-    AdapterRequest(LookupI* lookup, const std::string& adapterId, int retryCount) : 
+    AdapterRequest(LookupI* lookup, const std::string& adapterId, int retryCount) :
         RequestT<std::string, Ice::AMD_Locator_findAdapterByIdPtr>(lookup, adapterId, retryCount),
         _start(IceUtil::Time::now())
     {
@@ -228,7 +228,7 @@ public:
 #else
     virtual void findObjectById(const std::string&, const Ice::Identity&, const IceDiscovery::LookupReplyPrx&,
                                 const Ice::Current&);
-    virtual void findAdapterById(const std::string&, const std::string, ::std::shared_ptr<IceDiscovery::LookupReplyPrx>,
+    virtual void findAdapterById(const std::string&, const std::string&, const IceDiscovery::LookupReplyPrx&,
                                  const Ice::Current&);
     void findObject(const Ice::AMD_Locator_findObjectByIdPtr&, const Ice::Identity&);
     void findAdapter(const Ice::AMD_Locator_findAdapterByIdPtr&, const std::string&);
@@ -236,7 +236,7 @@ public:
 
     void foundObject(const Ice::Identity&, const Ice::ObjectPrxPtr&);
     void foundAdapter(const std::string&, const Ice::ObjectPrxPtr&, bool);
-    
+
     void adapterRequestTimedOut(const AdapterRequestPtr&);
     void objectRequestTimedOut(const ObjectRequestPtr&);