Changeset 922 for XIOS

Timestamp:

08/23/16 17:34:48 (8 years ago)

Author:

mhnguyen

Message:

Correcting compilation error with gcc 4.8

+) Remove some part which made gcc complain

Test
+) Compilation 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;       \
-  void setAttributesReference(bool apply = true);       \
+  const StdString& get##type##OutputName(void) const;        \
+  void setAttributesReference(bool apply = true);           \
                                                                        \
 private:                                                               \
@@ -89 +89 @@
 {                                                                      \
   if (!this->name.isEmpty())                                           \
-    return this->name;                                                 \    
+    return this->name;                                                 \
   else if (hasDirect##type##Reference())                               \
   {                                                                    \
@@ -95 +95 @@
     StdString nameRef = this->name_##_ref;                             \
     while (refer_ptr->hasAutoGeneratedId() &&                          \
-          (C##type::has(nameRef)))                                     \             
-    {                                                                  \                                                            
+          (C##type::has(nameRef)))                                     \
+    {                                                                  \
       tmp_ptr = refer_ptr;                                             \
       refer_ptr = tmp_ptr->getDirect##type##Reference();               \
-      nameRef = (refer_ptr->hasDirect##type##Reference())              \
-                 ? refer_ptr->name_##_ref : nameRef;                   \
-    }                                                                  \    
+      if (refer_ptr->hasDirect##type##Reference())                     \
+        nameRef = refer_ptr->name_##_ref;                              \
+    }                                                                  \
     return refer_ptr->name_##_ref;                                     \
   }                                                                    \