commit db4da5e4fb1afc494384044b97b6d1b77899ead5
author Davide Pesavento <davide.pesavento@lip6.fr> Fri Jun 15 11:37:52 2018 -0400
committer Alex Afanasyev <aa@cs.fiu.edu> Sun Jun 17 09:29:34 2018 -0700
tree fd075648a78dcf9a3ca28f5f5e3d2c12b7c46406
parent 634a62bb74776e1044111bee8713c3a70095dee7

Improve and simplify code with modern C++ features

Change-Id: I28d84df3087492ab2ecbeb91169a2cde12c9e31e

src/net/face-uri.cpp

diff --git a/src/net/face-uri.cpp b/src/net/face-uri.cpp
index ceed453..dc70760 100644
--- a/src/net/face-uri.cpp
+++ b/src/net/face-uri.cpp
@@ -656,11 +656,9 @@
     return;
   }
 
-  static CanonizeSuccessCallback successNop = bind([]{});
-  static CanonizeFailureCallback failureNop = bind([]{});
   cp->canonize(*this,
-               onSuccess ? onSuccess : successNop,
-               onFailure ? onFailure : failureNop,
+               onSuccess ? onSuccess : [] (auto&&) {},
+               onFailure ? onFailure : [] (auto&&) {},
                io, timeout);
 }