Changeset 1158 for XIOS/dev/dev_olga/src/declare_ref_func.hpp

Timestamp:

06/06/17 17:58:16 (7 years ago)

Author:

oabramkina

Message:

Two server levels: merging with trunk r1137.
There are bugs.

File:

• XIOS/dev/dev_olga/src/declare_ref_func.hpp (modified) (1 diff)

XIOS/dev/dev_olga/src/declare_ref_func.hpp

@@ -107 +107 @@
       if (refer_ptr->hasAutoGeneratedId() &&                           \
           refer_ptr->hasDirect##type##Reference())                     \
-          nameRef = refer_ptr->name_##_ref;                            \
+        nameRef = refer_ptr->name_##_ref;                              \
       else {                                                           \
-         nameRef = refer_ptr->getId(); break;                           \
-       }                                                                \
-       if (tmpRefObjects.end() != tmpRefObjects.find(refer_ptr))        \
-       {                                                                \
+        nameRef = refer_ptr->getId(); break;                           \
+      }                                                                \
+      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() << "\".");       \
-       }                                                               \
+              << "Circular dependency stopped for " #name_ " object "  \
+              << "with id = \"" << refer_ptr->getId() << "\".");       \
+      }                                                                \
     }                                                                  \
     return nameRef;                                                    \