[Lemon-commits] alpar: r3273 - lemon/trunk/lemon

[Lemon SVN]

Author: alpar
Date: Tue Apr 24 11:39:01 2007
New Revision: 3273

Modified:
   lemon/trunk/lemon/arg_parser.h

Log:
Integer parameters also convert to double


Modified: lemon/trunk/lemon/arg_parser.h
==============================================================================
--- lemon/trunk/lemon/arg_parser.h	(original)
+++ lemon/trunk/lemon/arg_parser.h	Tue Apr 24 11:39:01 2007
@@ -332,9 +332,11 @@
 	Opts::iterator i = _parser._opts.find(_name);
 	LEMON_ASSERT(i==_parser._opts.end(),
 		     std::string()+"Unkown option: '"+_name+"'");
-	LEMON_ASSERT(i->second.type!=ArgParser::DOUBLE,
+	LEMON_ASSERT(i->second.type!=ArgParser::DOUBLE &&
+		     i->second.type!=ArgParser::INTEGER,
 		     std::string()+"'"+_name+"' is a floating point option");
-	return *(i->second.double_p);
+	return i->second.type==ArgParser::DOUBLE ?
+	  *(i->second.double_p) : *(i->second.int_p);
       }
       ///\e
       operator int()