[QuantLibAddin-cvs] QuantLibAddin/qlo complextyperegistry.cpp, 1.2, 1.3 typefactory.hpp, 1.6, 1.7 typeregistry.hpp, 1.1, 1.2

[Eric E. <eri...@us...>]

Update of /cvsroot/quantlibaddin/QuantLibAddin/qlo
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24479/qlo

Modified Files:
	complextyperegistry.cpp typefactory.hpp typeregistry.hpp 
Log Message:
rename "Enumeration" -> "EnumeratedType", "ComplexType" -> "EnumeratedClass"

Index: complextyperegistry.cpp
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/qlo/complextyperegistry.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** complextyperegistry.cpp	29 Jun 2006 10:14:44 -0000	1.2
--- complextyperegistry.cpp	29 Jun 2006 10:47:33 -0000	1.3
***************
*** 235,239 ****
      /* *** Initialization *** */
  
!     ComplexTypeRegistry::ComplexTypeRegistry() {
          REG_ENUM(QuantLib::StrikedTypePayoff,
              MAP("AssetOrNothing", ASSETORNOTHING_Payoff);
--- 235,239 ----
      /* *** Initialization *** */
  
!     EnumClassRegistry::EnumClassRegistry() {
          REG_ENUM(QuantLib::StrikedTypePayoff,
              MAP("AssetOrNothing", ASSETORNOTHING_Payoff);

Index: typeregistry.hpp
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/qlo/typeregistry.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** typeregistry.hpp	19 May 2006 16:56:16 -0000	1.1
--- typeregistry.hpp	29 Jun 2006 10:47:33 -0000	1.2
***************
*** 42,55 ****
      };
  
!     class EnumRegistry : public Registry, public QuantLib::Singleton<EnumRegistry> {
!         friend class QuantLib::Singleton<EnumRegistry>;
      private:
!         EnumRegistry();
      };
  
!     class ComplexTypeRegistry : public Registry, public QuantLib::Singleton<ComplexTypeRegistry> {
!         friend class QuantLib::Singleton<ComplexTypeRegistry>;
      private:
!         ComplexTypeRegistry();
      };
  }
--- 42,55 ----
      };
  
!     class EnumTypeRegistry : public Registry, public QuantLib::Singleton<EnumTypeRegistry> {
!         friend class QuantLib::Singleton<EnumTypeRegistry>;
      private:
!         EnumTypeRegistry();
      };
  
!     class EnumClassRegistry : public Registry, public QuantLib::Singleton<EnumClassRegistry> {
!         friend class QuantLib::Singleton<EnumClassRegistry>;
      private:
!         EnumClassRegistry();
      };
  }

Index: typefactory.hpp
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/qlo/typefactory.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** typefactory.hpp	29 Jun 2006 10:14:44 -0000	1.6
--- typefactory.hpp	29 Jun 2006 10:47:33 -0000	1.7
***************
*** 66,70 ****
  
      template<typename T>
!     class Create : private RegistryManager<T, EnumRegistry> {
      public:
          T operator()(const std::string& id) {
--- 66,70 ----
  
      template<typename T>
!     class Create : private RegistryManager<T, EnumTypeRegistry> {
      public:
          T operator()(const std::string& id) {
***************
*** 72,76 ****
          }
          T *checkType(const std::string& id) {
!             return RegistryManager<T, EnumRegistry>::checkType(id);
          }
      };
--- 72,76 ----
          }
          T *checkType(const std::string& id) {
!             return RegistryManager<T, EnumTypeRegistry>::checkType(id);
          }
      };
***************
*** 78,82 ****
      template<>
      class Create<boost::shared_ptr<QuantLib::StrikedTypePayoff> > :
!         private RegistryManager<QuantLib::StrikedTypePayoff, ComplexTypeRegistry> {
      public:
          boost::shared_ptr<QuantLib::StrikedTypePayoff> operator()(const std::string& optionTypeID,
--- 78,82 ----
      template<>
      class Create<boost::shared_ptr<QuantLib::StrikedTypePayoff> > :
!         private RegistryManager<QuantLib::StrikedTypePayoff, EnumClassRegistry> {
      public:
          boost::shared_ptr<QuantLib::StrikedTypePayoff> operator()(const std::string& optionTypeID,
***************
*** 93,97 ****
      template<>
      class Create<boost::shared_ptr<QuantLib::PricingEngine> > :
!         private RegistryManager<QuantLib::PricingEngine, ComplexTypeRegistry> {
      public:
          boost::shared_ptr<QuantLib::PricingEngine> operator()(const std::string& engineID,
--- 93,97 ----
      template<>
      class Create<boost::shared_ptr<QuantLib::PricingEngine> > :
!         private RegistryManager<QuantLib::PricingEngine, EnumClassRegistry> {
      public:
          boost::shared_ptr<QuantLib::PricingEngine> operator()(const std::string& engineID,
***************
*** 105,109 ****
      template<>
      class Create<boost::shared_ptr<QuantLib::Extrapolator> > :
!         private RegistryManager<QuantLib::Extrapolator, ComplexTypeRegistry> {
      public:
          boost::shared_ptr<QuantLib::Extrapolator> operator() (
--- 105,109 ----
      template<>
      class Create<boost::shared_ptr<QuantLib::Extrapolator> > :
!         private RegistryManager<QuantLib::Extrapolator, EnumClassRegistry> {
      public:
          boost::shared_ptr<QuantLib::Extrapolator> operator() (