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

Diff for /pegasus/src/Pegasus/Common/CIMName.h between version 1.19 and 1.20

version 1.19, 2002/08/08 18:30:00 version 1.20, 2002/09/13 21:40:42
Line 24 
Line 24 
 // Author: Mike Brasher (mbrasher@bmc.com) // Author: Mike Brasher (mbrasher@bmc.com)
 // //
 // 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
   //                (carolann_graves@hp.com)
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 68 
Line 70 
  
     CIMName& operator=(const CIMName& name);     CIMName& operator=(const CIMName& name);
     CIMName& operator=(const String& name);     CIMName& operator=(const String& name);
     CIMName& operator=(const char* name);  
  
 #if 0  #ifndef PEGASUS_REMOVE_DEPRECATED
     String toString() const;      CIMName& operator=(const char* name);
 #endif #endif
  
       const String& getString() const;
   
   #ifndef PEGASUS_REMOVE_DEPRECATED
     operator String() const;     operator String() const;
   #endif
  
     Boolean isNull() const;     Boolean isNull() const;
  
Line 82 
Line 87 
  
     /** equal - Compares two names.     /** equal - Compares two names.
         @return Return true if the two names are equal. CIM names are         @return Return true if the two names are equal. CIM names are
         case insensitive and so it this method.          case insensitive and so is this method.
     */     */
     Boolean equal(const CIMName& name) const;     Boolean equal(const CIMName& name) const;
  
Line 94 
Line 99 
     */     */
     static Boolean legal(const String& name) throw();     static Boolean legal(const String& name) throw();
  
 #if 0  
     /** equal - Compares two names.  
         @return Return true if the two names are equal. CIM names are  
         case insensitive and so it this method.  
     */  
     static Boolean equal(const String& name1, const String& name2) throw();  
 #endif  
   
 private: private:
     String cimName;     String cimName;
 }; };
  
 #if 0  
 // Defining this causes ambiguous operator== errors between String and CIMName  
 PEGASUS_COMMON_LINKAGE Boolean operator==( PEGASUS_COMMON_LINKAGE Boolean operator==(
     const CIMName& name1,     const CIMName& name1,
     const CIMName& name2);     const CIMName& name2);
 #endif  
   
 #if 0  
 PEGASUS_COMMON_LINKAGE PEGASUS_STD(ostream)& operator<<(  
     PEGASUS_STD(ostream)& os,  
     const CIMName& name);  
 #endif  
  
 #define PEGASUS_ARRAY_T CIMName #define PEGASUS_ARRAY_T CIMName
 # include "ArrayInter.h" # include "ArrayInter.h"
Line 148 
Line 136 
  
     CIMNamespaceName& operator=(const CIMNamespaceName& name);     CIMNamespaceName& operator=(const CIMNamespaceName& name);
     CIMNamespaceName& operator=(const String& name);     CIMNamespaceName& operator=(const String& name);
     CIMNamespaceName& operator=(const char* name);  
  
 #if 0  #ifndef PEGASUS_REMOVE_DEPRECATED
     String toString() const;      CIMNamespaceName& operator=(const char* name);
 #endif #endif
  
       const String& getString() const;
   
   #ifndef PEGASUS_REMOVE_DEPRECATED
     operator String() const;     operator String() const;
   #endif
  
     Boolean isNull() const;     Boolean isNull() const;
  
Line 162 
Line 153 
  
     /** equal - Compares two names.     /** equal - Compares two names.
         @return Return true if the two names are equal. CIM names are         @return Return true if the two names are equal. CIM names are
         case insensitive and so it this method.          case insensitive and so is this method.
     */     */
     Boolean equal(const CIMNamespaceName& name) const;     Boolean equal(const CIMNamespaceName& name) const;
  
Line 174 
Line 165 
     */     */
     static Boolean legal(const String& name) throw();     static Boolean legal(const String& name) throw();
  
 #if 0  
     /** equal - Compares two names.  
         @return Return true if the two names are equal. CIM names are  
         case insensitive and so it this method.  
     */  
     static Boolean equal(const String& name1, const String& name2) throw();  
 #endif  
   
 private: private:
     String cimNamespaceName;     String cimNamespaceName;
 }; };
  
   PEGASUS_COMMON_LINKAGE Boolean operator==(
       const CIMNamespaceName& name1,
       const CIMNamespaceName& name2);
   
   #define PEGASUS_ARRAY_T CIMNamespaceName
   # include "ArrayInter.h"
   #undef PEGASUS_ARRAY_T
   
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END
  
 #endif /* Pegasus_Name_h */ #endif /* Pegasus_Name_h */

Legend:
Removed from v.1.19  
changed lines
  Added in v.1.20
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2