[QuantLibAddin-cvs] QuantLibAddin/qlo/Conversions coerceobject.hpp, 1.1, 1.2

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

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

Modified Files:
	coerceobject.hpp 
Log Message:
1) referenceFromObject renamed as objectToReference
2) referenceFromHandle renamed as handleToReference
3) CoerceObject  renamed as CoerceToObject 
4) code clean up

Index: coerceobject.hpp
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/qlo/Conversions/coerceobject.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** coerceobject.hpp	22 Nov 2006 21:37:25 -0000	1.1
--- coerceobject.hpp	4 Jan 2007 11:21:55 -0000	1.2
***************
*** 23,26 ****
--- 23,27 ----
  #include <qlo/handle.hpp>
  
+ //NANDO: why in the ObjectHandler namespace?
  namespace ObjHandler {
  
***************
*** 31,38 ****
  
      template <class qloClass, class qlClass>
!     bool referenceFromObject(
!             const boost::shared_ptr<ObjHandler::Object> &in,
!             boost::shared_ptr<qlClass> &out) {
!         boost::shared_ptr<qloClass> qloPointer =
              boost::dynamic_pointer_cast<qloClass>(in);
          if (qloPointer) {
--- 32,38 ----
  
      template <class qloClass, class qlClass>
!     bool objectToReference(const boost::shared_ptr<ObjHandler::Object> &in,
!                            boost::shared_ptr<qlClass> &out) {
!         boost::shared_ptr<qloClass> qloPointer = 
              boost::dynamic_pointer_cast<qloClass>(in);
          if (qloPointer) {
***************
*** 45,52 ****
  
      template <class qlClass>
!     bool referenceFromHandle(
!             const boost::shared_ptr<ObjHandler::Object> &in,
!             boost::shared_ptr<qlClass> &out) {
! 
          boost::shared_ptr<QuantLibAddin::Handle<qlClass> > handlePointer =
              boost::dynamic_pointer_cast<QuantLibAddin::Handle<qlClass> >(in);
--- 45,50 ----
  
      template <class qlClass>
!     bool handleToReference(const boost::shared_ptr<ObjHandler::Object> &in,
!                            boost::shared_ptr<qlClass> &out) {
          boost::shared_ptr<QuantLibAddin::Handle<qlClass> > handlePointer =
              boost::dynamic_pointer_cast<QuantLibAddin::Handle<qlClass> >(in);
***************
*** 55,64 ****
              return false;
  
!         OH_REQUIRE(!handlePointer->getHandle().empty(),
!                 "handle contains null reference");
  
          out = handlePointer->getHandle().currentLink();
!         OH_REQUIRE(out, "unable to retrieve reference"
!                 << " contained in handle");
  
          return true;
--- 53,63 ----
              return false;
  
!         // this check should be now redundant, since it is performed
!         // in QuantLib::Handle.currentLink()
!         //OH_REQUIRE(!handlePointer->getHandle().empty(),
!         //           "handle contains null reference");
  
          out = handlePointer->getHandle().currentLink();
!         OH_REQUIRE(out, "unable to retrieve reference contained in handle");
  
          return true;
***************
*** 66,76 ****
  
      template <class qloClass, class qlClass>
!     class CoerceObject : public ObjHandler::Coerce<
              boost::shared_ptr<ObjHandler::Object>, 
              boost::shared_ptr<qlClass> > {
          Conversion *getConversions() {
              static Conversion conversions[] = {
!                 referenceFromObject<qloClass, qlClass>,
!                 referenceFromHandle<qlClass>,
                  0
              };
--- 65,75 ----
  
      template <class qloClass, class qlClass>
!     class CoerceToObject : public ObjHandler::Coerce<
              boost::shared_ptr<ObjHandler::Object>, 
              boost::shared_ptr<qlClass> > {
          Conversion *getConversions() {
              static Conversion conversions[] = {
!                 objectToReference<qloClass, qlClass>,
!                 handleToReference<qlClass>,
                  0
              };