[QuantLibAddin-cvs] QuantLibAddin/qlo calendar.cpp,1.1,1.2 calendar.hpp,1.1,1.2

[Ferdinando A. <na...@us...>]

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

Modified Files:
	calendar.cpp calendar.hpp 
Log Message:
assorted fixes

Index: calendar.hpp
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/qlo/calendar.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** calendar.hpp	19 May 2006 16:56:16 -0000	1.1
--- calendar.hpp	23 May 2006 11:49:07 -0000	1.2
***************
*** 29,33 ****
          JointCalendar(
              const QuantLib::JointCalendarRule &jointCalendarRule,
!             const std::vector < std::string > &calendars);
          virtual boost::shared_ptr<void> getReference() const {
              return boost::static_pointer_cast<void>(jointCalendar_);
--- 29,33 ----
          JointCalendar(
              const QuantLib::JointCalendarRule &jointCalendarRule,
!             const std::vector <QuantLib::Calendar> &calendars);
          virtual boost::shared_ptr<void> getReference() const {
              return boost::static_pointer_cast<void>(jointCalendar_);

Index: calendar.cpp
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/qlo/calendar.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** calendar.cpp	19 May 2006 16:56:16 -0000	1.1
--- calendar.cpp	23 May 2006 11:49:07 -0000	1.2
***************
*** 28,52 ****
      JointCalendar::JointCalendar(
          const QuantLib::JointCalendarRule &jointCalendarRule,
!         const std::vector < std::string > &calendars) {
              if (calendars.size() == 2) {
                  jointCalendar_ = boost::shared_ptr<QuantLib::JointCalendar>(
                      new QuantLib::JointCalendar(
!                         Create<QuantLib::Calendar>()(calendars[0]),
!                         Create<QuantLib::Calendar>()(calendars[1]),
                          jointCalendarRule));
              } else if (calendars.size() == 3) {
                  jointCalendar_ = boost::shared_ptr<QuantLib::JointCalendar>(
                      new QuantLib::JointCalendar(
!                         Create<QuantLib::Calendar>()(calendars[0]),
!                         Create<QuantLib::Calendar>()(calendars[1]),
!                         Create<QuantLib::Calendar>()(calendars[2]),
                          jointCalendarRule));
              } else if (calendars.size() == 4) {
                  jointCalendar_ = boost::shared_ptr<QuantLib::JointCalendar>(
                      new QuantLib::JointCalendar(
!                         Create<QuantLib::Calendar>()(calendars[0]),
!                         Create<QuantLib::Calendar>()(calendars[1]),
!                         Create<QuantLib::Calendar>()(calendars[2]),
!                         Create<QuantLib::Calendar>()(calendars[3]),
                          jointCalendarRule));
              } else {
--- 28,52 ----
      JointCalendar::JointCalendar(
          const QuantLib::JointCalendarRule &jointCalendarRule,
!         const std::vector <QuantLib::Calendar> &calendars) {
              if (calendars.size() == 2) {
                  jointCalendar_ = boost::shared_ptr<QuantLib::JointCalendar>(
                      new QuantLib::JointCalendar(
!                         calendars[0],
!                         calendars[1],
                          jointCalendarRule));
              } else if (calendars.size() == 3) {
                  jointCalendar_ = boost::shared_ptr<QuantLib::JointCalendar>(
                      new QuantLib::JointCalendar(
!                         calendars[0],
!                         calendars[1],
!                         calendars[2],
                          jointCalendarRule));
              } else if (calendars.size() == 4) {
                  jointCalendar_ = boost::shared_ptr<QuantLib::JointCalendar>(
                      new QuantLib::JointCalendar(
!                         calendars[0],
!                         calendars[1],
!                         calendars[2],
!                         calendars[3],
                          jointCalendarRule));
              } else {