Changeset 639 for CMT

Timestamp:

Jun 6, 2013, 3:21:22 PM (11 years ago)

Author:

rybkin

Message:

merge -r 628:629 HEAD source/cmt_project.cxx ChangeLog

Location:

CMT/v1r25-branch

Files:

• ChangeLog (modified) (1 diff, 1 prop)
• source/cmt_project.cxx (modified) (2 diffs, 1 prop)

CMT/v1r25-branch/ChangeLog

@@ +1 @@
+2013-01-25    <rybkin@lal.in2p3.fr> 500
+
+        * source/cmt_project.cxx: In class Project functions set_strategy and
+        update_strategy, update strategy for project(s) without parent and children 
+
 2013-01-11    <rybkin@lal.in2p3.fr> 499
 

CMT/v1r25-branch/source/cmt_project.cxx

@@ -2958 +2958 @@
       project->update_strategy (definition, b_value);
     }
+
+  const ProjectPtrVector& OrderedProjects = Project::ordered_projects ();
+  for (int i = OrderedProjects.size () - 2; i >= 0; i--)
+    {
+      if (this != OrderedProjects[i + 1]) continue;
+      if (!OrderedProjects[i]->has_parents () &&
+          OrderedProjects[i]->get_children_size () == 0)
+        {
+          OrderedProjects[i]->update_strategy (definition, b_value);
+        }
+      break;
+    }
 }
 
@@ -3011 +3023 @@
 
           project->update_strategy (definition, b_value);
+        }
+
+      const ProjectPtrVector& OrderedProjects = Project::ordered_projects ();
+      for (int i = OrderedProjects.size () - 2; i >= 0; i--)
+        {
+          if (this != OrderedProjects[i + 1]) continue;
+          if (!OrderedProjects[i]->has_parents () &&
+              OrderedProjects[i]->get_children_size () == 0)
+            {
+              OrderedProjects[i]->update_strategy (definition, b_value);
+            }
+          break;
         }
     }