(file) Return to CIMObjectPath.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/CIMObjectPath.cpp between version 1.34 and 1.38

version 1.34, 2003/11/13 20:16:15 version 1.38, 2004/05/18 11:03:38
Line 28 
Line 28 
 // Modified By: Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com) // Modified By: Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com)
 //              Carol Ann Krug Graves, Hewlett-Packard Company //              Carol Ann Krug Graves, Hewlett-Packard Company
 //                (carolann_graves@hp.com) //                (carolann_graves@hp.com)
   //              Amit K Arora, IBM (amita@in.ibm.com)
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 39 
Line 40 
 #include "CIMObjectPath.h" #include "CIMObjectPath.h"
 #include "Indentor.h" #include "Indentor.h"
 #include "CIMName.h" #include "CIMName.h"
 #include "Destroyer.h"  
 #include "XmlWriter.h" #include "XmlWriter.h"
 #include "XmlReader.h" #include "XmlReader.h"
 #include "ArrayInternal.h" #include "ArrayInternal.h"
Line 177 
Line 177 
 }; };
  
  
 CIMKeyBinding::CIMKeyBinding()  CIMKeyBinding::CIMKeyBinding():
               _rep(new CIMKeyBindingRep())
 { {
     _rep = new CIMKeyBindingRep();  
 } }
  
 CIMKeyBinding::CIMKeyBinding(const CIMKeyBinding& x)  CIMKeyBinding::CIMKeyBinding(const CIMKeyBinding& x):
               _rep(new CIMKeyBindingRep(*(x._rep.get())))
 { {
     _rep = new CIMKeyBindingRep(*x._rep);  
 } }
  
 CIMKeyBinding::CIMKeyBinding(const CIMName& name, const String& value, Type type)  CIMKeyBinding::CIMKeyBinding(const CIMName& name, const String& value, Type type) :
               _rep(new CIMKeyBindingRep(name, value, type))
 { {
     _rep = new CIMKeyBindingRep(name, value, type);  
 } }
  
 CIMKeyBinding::CIMKeyBinding(const CIMName& name, const CIMValue& value) CIMKeyBinding::CIMKeyBinding(const CIMName& name, const CIMValue& value)
Line 220 
Line 220 
         break;         break;
     }     }
  
     _rep = new CIMKeyBindingRep(name, kbValue, kbType);      _rep.reset(new CIMKeyBindingRep(name, kbValue, kbType));
 } }
  
 CIMKeyBinding::~CIMKeyBinding() CIMKeyBinding::~CIMKeyBinding()
 { {
     delete _rep;  
 } }
  
 CIMKeyBinding& CIMKeyBinding::operator=(const CIMKeyBinding& x) CIMKeyBinding& CIMKeyBinding::operator=(const CIMKeyBinding& x)
 { {
     *_rep = *x._rep;      CIMKeyBindingRep *tmp = new CIMKeyBindingRep(*x._rep.get());
       _rep.reset(tmp);
     return *this;     return *this;
 } }
  
Line 521 
Line 521 
 }; };
  
  
 CIMObjectPath::CIMObjectPath()  CIMObjectPath::CIMObjectPath() :
            _rep(new CIMObjectPathRep())
 { {
     _rep = new CIMObjectPathRep();  
 } }
  
 CIMObjectPath::CIMObjectPath(const CIMObjectPath& x)  CIMObjectPath::CIMObjectPath(const CIMObjectPath& x) :
            _rep(new CIMObjectPathRep(*x._rep.get()))
 { {
     _rep = new CIMObjectPathRep(*x._rep);  
 } }
  
 CIMObjectPath::CIMObjectPath(const String& objectName) CIMObjectPath::CIMObjectPath(const String& objectName)
Line 537 
Line 538 
     CIMObjectPath tmpRef;     CIMObjectPath tmpRef;
     tmpRef.set(objectName);     tmpRef.set(objectName);
  
     _rep = new CIMObjectPathRep(*tmpRef._rep);      _rep.reset(new CIMObjectPathRep(*tmpRef._rep.get()));
 } }
  
 CIMObjectPath::CIMObjectPath( CIMObjectPath::CIMObjectPath(
Line 550 
Line 551 
     CIMObjectPath tmpRef;     CIMObjectPath tmpRef;
     tmpRef.set(host, nameSpace, className, keyBindings);     tmpRef.set(host, nameSpace, className, keyBindings);
  
     _rep = new CIMObjectPathRep(*tmpRef._rep);      _rep.reset(new CIMObjectPathRep(*tmpRef._rep.get()));
 } }
  
 CIMObjectPath::~CIMObjectPath() CIMObjectPath::~CIMObjectPath()
 { {
     delete _rep;  
 } }
  
 CIMObjectPath& CIMObjectPath::operator=(const CIMObjectPath& x) CIMObjectPath& CIMObjectPath::operator=(const CIMObjectPath& x)
 { {
     *_rep = *x._rep;      CIMObjectPathRep *tmp = new CIMObjectPathRep(*x._rep.get());
       _rep.reset(tmp);
     return *this;     return *this;
 } }
  
Line 839 
Line 840 
  
     // Convert to a C String first:     // Convert to a C String first:
  
     CString pCString = objectName.getCStringUTF8();      CString pCString = objectName.getCString();
     char* p = const_cast<char*>((const char*) pCString);     char* p = const_cast<char*>((const char*) pCString);
     Boolean gotHost;     Boolean gotHost;
     Boolean gotNamespace;     Boolean gotNamespace;
Line 897 
Line 898 
  
 void CIMObjectPath::setHost(const String& host) void CIMObjectPath::setHost(const String& host)
 { {
       if ((host != String::EMPTY) && !CIMObjectPathRep::isValidHostname(host))
       {
           throw MalformedObjectNameException(host);
       }
   
     _rep->_host = host;     _rep->_host = host;
 } }
  
Line 1109 
Line 1115 
     return !operator==(x, y);     return !operator==(x, y);
 } }
  
 #ifndef PEGASUS_REMOVE_DEPRECATED  #ifdef PEGASUS_USE_DEPRECATED_INTERFACES
 PEGASUS_STD(ostream)& operator<<( PEGASUS_STD(ostream)& operator<<(
     PEGASUS_STD(ostream)& os,     PEGASUS_STD(ostream)& os,
     const CIMObjectPath& x)     const CIMObjectPath& x)


Legend:
Removed from v.1.34  
changed lines
  Added in v.1.38

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2