Fix compilation with visual studio

daniele77 · daniele77 · commit e7ccbf5cd7ff · 2019-03-07T23:01:49.000+01:00
diff --git a/cli/cli.h b/cli/cli.h
@@ -685,7 +685,7 @@ namespace cli
             F fun,
             const std::string& desc = "unknown command"
         )
-            : Command(_name), function(std::move(fun)), description(desc)
+            : Command(_name), func(std::move(fun)), description(desc)
         {
         }
 
@@ -697,7 +697,7 @@ namespace cli
             {
                 try
                 {
-                    auto g = [&](auto ... pars){ function( session.OutStream(), pars... ); };
+                    auto g = [&](auto ... pars){ func( session.OutStream(), pars... ); };
                     Select<decltype(g), Args...>::Exec(g, std::next(cmdLine.begin()), cmdLine.end());
                 }
                 catch (boost::bad_lexical_cast &)
@@ -717,7 +717,7 @@ namespace cli
 
     private:
 
-        const F function;
+        const F func;
         const std::string description;
     };
 

Original file line number	Diff line number	Diff line change
`@@ -685,7 +685,7 @@ namespace cli`
`685`	`685`	`F fun,`
`686`	`686`	`const std::string& desc = "unknown command"`
`687`	`687`	`)`
`688`		`- : Command(_name), function(std::move(fun)), description(desc)`
	`688`	`+ : Command(_name), func(std::move(fun)), description(desc)`
`689`	`689`	`{`
`690`	`690`	`}`
`691`	`691`
`@@ -697,7 +697,7 @@ namespace cli`
`697`	`697`	`{`
`698`	`698`	`try`
`699`	`699`	`{`
`700`		`- auto g = [&](auto ... pars){ function( session.OutStream(), pars... ); };`
	`700`	`+ auto g = [&](auto ... pars){ func( session.OutStream(), pars... ); };`
`701`	`701`	`Select<decltype(g), Args...>::Exec(g, std::next(cmdLine.begin()), cmdLine.end());`
`702`	`702`	`}`
`703`	`703`	`catch (boost::bad_lexical_cast &)`
`@@ -717,7 +717,7 @@ namespace cli`
`717`	`717`
`718`	`718`	`private:`
`719`	`719`
`720`		`- const F function;`
	`720`	`+ const F func;`
`721`	`721`	`const std::string description;`
`722`	`722`	`};`
`723`	`723`