Changeset 769 for XIOS/trunk/src/object.cpp

Timestamp:

10/30/15 16:33:48 (9 years ago)

Author:

rlacroix

Message:

Keep track of whether an object id was automatically generated or not.

File:

• XIOS/trunk/src/object.cpp (modified) (1 diff)

XIOS/trunk/src/object.cpp

@@ -3 +3 @@
 namespace xios
 {
-   /// ////////////////////// Définitions ////////////////////// ///
+  /// ////////////////////// Définitions ////////////////////// ///
 
-   CObject::CObject(void)
-      : id(), IdDefined(false)
-   { /* Ne rien faire de plus */ }
+  CObject::CObject(void)
+    : id(), idDefined(false), idAutoGenerated(false)
+  { /* Ne rien faire de plus */ }
 
-   CObject::CObject(const StdString & id)
-      : id(id), IdDefined(true)
-   { /* Ne rien faire de plus */ }
+  CObject::CObject(const StdString& id, bool idAutoGenerated /*= false*/)
+    : id(id)
+    , idDefined(true)
+    , idAutoGenerated(idAutoGenerated)
+  { /* Ne rien faire de plus */ }
 
-   CObject::CObject(const CObject & object)
-      : id(object.id), IdDefined(object.IdDefined)
-   { /* Ne rien faire de plus */ }
+  CObject::CObject(const CObject& object)
+    : id(object.id)
+    , idDefined(object.idDefined)
+    , idAutoGenerated(object.idAutoGenerated)
+  { /* Ne rien faire de plus */ }
 
-   CObject::~CObject(void)
-   { /* Ne rien faire de plus */ }
+  CObject::~CObject(void)
+  { /* Ne rien faire de plus */ }
 
-   const StdString & CObject::getId(void) const
-   {
-      return (this->id);
-   }
+  const StdString& CObject::getId(void) const
+  {
+    return this->id;
+  }
 
-   const StdString& CObject::getIdServer()
-   {
-      return (this->id);
-   }
+  const StdString& CObject::getIdServer() const
+  {
+    return this->id;
+  }
 
-   bool CObject::hasId(void) const
-   {
-      return (this->IdDefined);
-   }
+  bool CObject::hasId(void) const
+  {
+    return this->idDefined;
+  }
 
-   void CObject::resetId(void)
-   {
-      this->IdDefined = false ;
-   }
+  bool CObject::hasAutoGeneratedId(void) const
+  {
+    return this->idAutoGenerated;
+  }
 
-   void CObject::setId(const StdString & id)
-   {
-      this->id = id ;
-      this->IdDefined = true ;
-   }
-/*
-   bool CObject::operator==(const CObject & other) const
-   {
-      if(!this->hasId() || !other.hasId())
-         return (false);
-      return (this->id.compare(other.id) == 0);
-   }
+  void CObject::resetId(void)
+  {
+    this->idDefined = false;
+  }
 
-   bool CObject::operator!=(const CObject & other) const
-   {
-      return (!(*this == other));
-   }
-*/
-   StdOStream & operator << (StdOStream & os, const CObject & object)
-   {
-      os << object.toString();
-      return (os);
-   }
+  void CObject::setId(const StdString& id, bool idAutoGenerated /*= false*/)
+  {
+    this->id = id;
+    this->idDefined = true;
+    this->idAutoGenerated = false;
+  }
 
+  /*
+  bool CObject::operator==(const CObject& other) const
+  {
+    if(!this->hasId() || !other.hasId())
+    return false;
+    return this->id.compare(other.id) == 0;
+  }
+
+  bool CObject::operator!=(const CObject& other) const
+  {
+    return !(*this == other);
+  }
+  */
+
+  StdOStream& operator<<(StdOStream& os, const CObject& object)
+  {
+    os << object.toString();
+    return os;
+  }
 } // namespace xios