- Option opt(n, v, d);
- if(pending_options.count(n))
- opt.value = pending_options[n];
- options.insert(OptionMap::value_type(n, opt));
+ Option opt(f);
+ InputOptions::const_iterator i = pending_options.find(opt.name);
+ if(i!=pending_options.end())
+ opt.value = i->second;
+
+ return options.insert(OptionMap::value_type(opt.name, opt)).first->second;