[QuantLibAddin-cvs] QuantLibAddin/qlo typefactory.hpp, 1.24.2.2, 1.24.2.3
Brought to you by:
ericehlers,
nando
|
From: Eric E. <eri...@us...> - 2006-08-03 18:05:25
|
Update of /cvsroot/quantlibaddin/QuantLibAddin/qlo In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv856/qlo Modified Files: Tag: R000313f0-branch typefactory.hpp Log Message: fix for gcc4 Index: typefactory.hpp =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/qlo/typefactory.hpp,v retrieving revision 1.24.2.2 retrieving revision 1.24.2.3 diff -C2 -d -r1.24.2.2 -r1.24.2.3 *** typefactory.hpp 2 Aug 2006 13:04:41 -0000 1.24.2.2 --- typefactory.hpp 3 Aug 2006 18:05:22 -0000 1.24.2.3 *************** *** 90,94 **** for (i = type_map->begin(); i != type_map->end(); i++) if (uppercase(i->first) == idUpper) ! return static_cast<ConstructorSignature>(i->second); QL_FAIL("Unknown id for Type: " << id); } --- 90,95 ---- for (i = type_map->begin(); i != type_map->end(); i++) if (uppercase(i->first) == idUpper) ! //return static_cast<ConstructorSignature>(i->second); ! return (ConstructorSignature)(i->second); QL_FAIL("Unknown id for Type: " << id); } *************** *** 99,104 **** public: T operator()(const std::string& id) { ! return *(getType<std::string, T*>(id)); ! //return *(this->getType(id)); } using RegistryManager<T, EnumTypeRegistry>::checkType; --- 100,105 ---- public: T operator()(const std::string& id) { ! //return *(getType<std::string, T*>(id)); ! return *(this->getType(id)); } using RegistryManager<T, EnumTypeRegistry>::checkType; |