ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/utils/ParameterManager.hpp
(Generate patch)

Comparing trunk/OOPSE-4/src/utils/ParameterManager.hpp (file contents):
Revision 2515 by chuckv, Wed Nov 16 21:37:45 2005 UTC vs.
Revision 2516 by tim, Fri Dec 16 18:55:55 2005 UTC

# Line 44 | Line 44
44   *
45   *  Created by Charles F. Vardeman II on 11/16/05.
46   *  @author  Charles F. Vardeman II
47 < *  @version $Id: ParameterManager.hpp,v 1.1 2005-11-16 21:37:45 chuckv Exp $
47 > *  @version $Id: ParameterManager.hpp,v 1.2 2005-12-16 18:55:55 tim Exp $
48   *
49   */
50  
# Line 189 | Line 189 | parameters_.insert(std::make_pair(std::string(KEYWORD)
189  
190   #define DefineParameter(NAME,KEYWORD)                              \
191   NAME.setKeyword(KEYWORD);                  \
192 < parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
192 > parameters_.insert(std::map<std::string, ParameterBase*>::value_type(std::string(KEYWORD), static_cast<ParameterBase*>(&NAME)));
193  
194   #define DefineOptionalParameter(NAME,KEYWORD)                              \
195   NAME.setKeyword(KEYWORD); NAME.setOptional(true);                    \
196 < parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
196 > parameters_.insert(std::map<std::string, ParameterBase*>::value_type(std::string(KEYWORD), static_cast<ParameterBase*>(&NAME)));
197  
198   #define DefineOptionalParameterWithDefaultValue(NAME,KEYWORD, DEFAULTVALUE)                              \
199   NAME.setKeyword(KEYWORD); NAME.setOptional(true); NAME.setDefaultValue(DEFAULTVALUE);                      \
200 < parameters_.insert(std::make_pair(std::string(KEYWORD),  &NAME));
200 > parameters_.insert(std::map<std::string, ParameterBase*>::value_type(std::string(KEYWORD), static_cast<ParameterBase*>(&NAME)));
201  
202   #define CheckParameter(NAME, CONSTRAINT)                              \
203   if (!NAME.empty()) { if (!(CONSTRAINT)(NAME.getData())) { sprintf(painCave.errMsg,"Error in checking %s : should be %s\n",NAME.getKeyword().c_str(),(CONSTRAINT).getConstraintDescription().c_str()); painCave.isFatal = 1; painCave.severity = OOPSE_ERROR; simError();} }                

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines