Changeset 962

Timestamp:

10/04/16 19:01:39 (8 years ago)

Author:

mhnguyen

Message:

Improving name-search in inheritance tree

+) If there is no name defined in a inheritance tree, id of the ancestor will be used

Test
+) Ok

File:

• XIOS/trunk/src/declare_ref_func.hpp (modified) (3 diffs)

XIOS/trunk/src/declare_ref_func.hpp

@@ -18 +18 @@
   bool hasDirect##type##Reference(void) const;              \
   C##type* getDirect##type##Reference(void) const;          \
-  const StdString& get##type##OutputName(void) const;       \
+  const StdString get##type##OutputName(void) const;        \
   void setAttributesReference(bool apply = true);           \
   bool hasRefTo(C##type* ref) const;                        \
@@ -87 +87 @@
 }                                                                      \
                                                                        \
-const StdString& C##type::get##type##OutputName(void) const            \
+const StdString C##type::get##type##OutputName(void) const            \
 {                                                                      \
   if (!this->name.isEmpty())                                           \
@@ -95 +95 @@
     const C##type* refer_ptr = this, *tmp_ptr;                         \
     StdString nameRef = this->name_##_ref;                             \
+    std::set<const C##type*> tmpRefObjects;                                  \
     while (refer_ptr->hasAutoGeneratedId() &&                          \
           (C##type::has(nameRef)))                                     \
     {                                                                  \
+      tmpRefObjects.insert(refer_ptr);                                 \
       tmp_ptr = refer_ptr;                                             \
       refer_ptr = tmp_ptr->getDirect##type##Reference();               \
       if (refer_ptr->hasDirect##type##Reference())                     \
         nameRef = refer_ptr->name_##_ref;                              \
+      if (tmpRefObjects.end() != tmpRefObjects.find(refer_ptr))        \
+      {                                                                \
+        ERROR("const StdString& C" #type "::get" #type "OutputName(void) const ",      \
+              << "Circular dependency stopped for " #name_ " object "  \
+              << "with id = \"" << refer_ptr->getId() << "\".");       \
+      }                                                                \
     }                                                                  \
-    return refer_ptr->name_##_ref;                                     \
+    return nameRef;                                                    \
   }                                                                    \
   else                                                                 \