[Scstudio-commits] SF.net SVN: scstudio:[564] trunk

[<ma...@us...>]

Revision: 564
          http://scstudio.svn.sourceforge.net/scstudio/?rev=564&view=rev
Author:   madzin
Date:     2010-02-04 11:54:01 +0000 (Thu, 04 Feb 2010)

Log Message:
-----------
Changes remove_minimal_events, remove_maximal_events  

Modified Paths:
--------------
    trunk/src/data/msc.h
    trunk/tests/z120_test/z120_test11.mpr.result
    trunk/tests/z120_test/z120_test69.mpr.result
    trunk/tests/z120_test/z120_test86.mpr.result

Modified: trunk/src/data/msc.h
===================================================================
--- trunk/src/data/msc.h	2010-02-03 13:44:07 UTC (rev 563)
+++ trunk/src/data/msc.h	2010-02-04 11:54:01 UTC (rev 564)
@@ -2299,8 +2299,21 @@
    */
   void remove_minimal_event(CoregionEvent* e)
   {
-    std::remove_if(m_minimal_events.begin(), m_minimal_events.end(),
-      std::bind2nd(std::equal_to<CoregionEvent*>(), e));
+    CoregionEventPVector::iterator it,it_d;
+
+    bool remove = false;
+
+    for(it = m_minimal_events.begin(); it != m_minimal_events.end(); it++)
+    {
+      if(*it == e)
+      {
+        it_d = it;
+        remove = true;
+      }
+    }
+
+    if(remove)
+      m_minimal_events.erase(it_d);
   }
 
   /**
@@ -2318,8 +2331,21 @@
    */
   void remove_maximal_event(CoregionEvent* e)
   {
-    std::remove_if(m_maximal_events.begin(), m_maximal_events.end(),
-      std::bind2nd(std::equal_to<CoregionEvent*>(), e));
+    CoregionEventPVector::iterator it,it_d;
+
+    bool remove = false;
+
+    for(it = m_maximal_events.begin(); it != m_maximal_events.end(); it++)
+    {
+      if(*it == e)
+      {
+        it_d = it;
+        remove = true;
+      }
+    }
+        
+    if(remove)
+      m_maximal_events.erase(it_d);    
   }
 
   bool is_empty()

Modified: trunk/tests/z120_test/z120_test11.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test11.mpr.result	2010-02-03 13:44:07 UTC (rev 563)
+++ trunk/tests/z120_test/z120_test11.mpr.result	2010-02-04 11:54:01 UTC (rev 564)
@@ -18,9 +18,9 @@
 in ACK,2 from PC;
 concurrent;
 in request_a,3 from PC before e0;
+in request_b,4 from PC;
 label e0;
 out result,5 to PC;
-in request_b,4 from PC;
 endconcurrent;
 endinstance;
 endmsc;

Modified: trunk/tests/z120_test/z120_test69.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test69.mpr.result	2010-02-03 13:44:07 UTC (rev 563)
+++ trunk/tests/z120_test/z120_test69.mpr.result	2010-02-04 11:54:01 UTC (rev 564)
@@ -20,11 +20,11 @@
 in ACK,2 from PC;
 concurrent;
 in request_a,3 from PC before e0, e1;
+in request_b,4 from PC;
 label e0;
 out result,5 to PC;
 label e1;
 ;
-in request_b,4 from PC;
 endconcurrent;
 endinstance;
 endmsc;

Modified: trunk/tests/z120_test/z120_test86.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test86.mpr.result	2010-02-03 13:44:07 UTC (rev 563)
+++ trunk/tests/z120_test/z120_test86.mpr.result	2010-02-04 11:54:01 UTC (rev 564)
@@ -11,12 +11,12 @@
 inst NAME2;
 NAME1: instance;
 concurrent;
+in a,0 from NAME2;
+in a,1 from found before e0;
 label e0;
+out b,2 to NAME2 before e1;
+label e1;
 ;
-in a,0 from NAME2;
-in a,1 from found before e1;
-label e1;
-out b,2 to NAME2 before e0;
 endconcurrent;
 endinstance;
 NAME2: instance;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.