X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Console%2FParsedCommand.test.cc;h=223a3e3808a09637c279f6a26db03e83c370c049;hb=1863c038d0400159ce49b851a5b81c2ce698c684;hp=a9e47a4c0539838d2aa895d1f41aed36708b5b27;hpb=81a550d520e8531b7f353e1ce0da5b99c249cecb;p=senf.git

diff --git a/Console/ParsedCommand.test.cc b/Console/ParsedCommand.test.cc
index a9e47a4..223a3e3 100644
--- a/Console/ParsedCommand.test.cc
+++ b/Console/ParsedCommand.test.cc
@@ -50,11 +50,8 @@ namespace {
 
     struct TestParser 
     {
-        typedef senf::console::ParseCommandInfo::TokensRange const & first_argument_type;
-        typedef std::string & second_argument_type;
-        typedef void result_type;
-
-        result_type operator()(first_argument_type, second_argument_type out) const
+        void operator()(senf::console::ParseCommandInfo::TokensRange const &,
+                        std::string & out) const
             { out = "true"; }
     };
 
@@ -144,7 +141,9 @@ BOOST_AUTO_UNIT_TEST(parsedCommand)
     {
         std::stringstream ss;
 
-        dir.add("cb7", &cb2)
+        // This tests adding boost::function objects and at the same time validates, that 
+        // compatible types also work
+        dir.add("cb7", boost::function<float()>(&cb2))
             .formatter( &testFormatter );
         BOOST_CHECK_NO_THROW(
             parser.parse("test/cb7",