|
From: <got...@us...> - 2008-11-23 22:03:05
|
Revision: 121
http://scstudio.svn.sourceforge.net/scstudio/?rev=121&view=rev
Author: gotthardp
Date: 2008-11-23 22:03:00 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
Removed warnings on Win32
Modified Paths:
--------------
trunk/src/check/deadlock_checker.cpp
trunk/src/check/fifo_checker.h
trunk/src/check/livelock_checker.cpp
trunk/src/data/msc.h
Modified: trunk/src/check/deadlock_checker.cpp
===================================================================
--- trunk/src/check/deadlock_checker.cpp 2008-11-23 20:43:27 UTC (rev 120)
+++ trunk/src/check/deadlock_checker.cpp 2008-11-23 22:03:00 UTC (rev 121)
@@ -171,7 +171,7 @@
{
traverser.traverse(hmsc);
}
- catch (DeadlockException& e)
+ catch (DeadlockException)
{
p = create_counter_example(traverser.get_reached_elements());
traverser.cleanup_traversing_attributes();
Modified: trunk/src/check/fifo_checker.h
===================================================================
--- trunk/src/check/fifo_checker.h 2008-11-23 20:43:27 UTC (rev 120)
+++ trunk/src/check/fifo_checker.h 2008-11-23 22:03:00 UTC (rev 121)
@@ -78,14 +78,14 @@
SRChannelMapperPtr p = chm;
return true;
}
- catch(std::bad_cast& b)
+ catch(std::bad_cast)
{
try
{
SRLChannelMapperPtr p = chm;
return true;
}
- catch(std::bad_cast& b){}
+ catch(std::bad_cast){}
}
return false;
}
Modified: trunk/src/check/livelock_checker.cpp
===================================================================
--- trunk/src/check/livelock_checker.cpp 2008-11-23 20:43:27 UTC (rev 120)
+++ trunk/src/check/livelock_checker.cpp 2008-11-23 22:03:00 UTC (rev 121)
@@ -95,7 +95,7 @@
{
traverser.traverse(hmsc);
}
- catch(LivelockException& e)
+ catch(LivelockException)
{
p = create_counter_example(traverser.get_reached_elements());
}
Modified: trunk/src/data/msc.h
===================================================================
--- trunk/src/data/msc.h 2008-11-23 20:43:27 UTC (rev 120)
+++ trunk/src/data/msc.h 2008-11-23 22:03:00 UTC (rev 121)
@@ -767,7 +767,7 @@
p = m_msc;
return p;
}
- catch(std::bad_cast& c){}
+ catch(std::bad_cast){}
return p;
}
@@ -784,7 +784,7 @@
p = m_msc;
return p;
}
- catch(std::bad_cast& c){}
+ catch(std::bad_cast){}
return p;
}
@@ -1268,9 +1268,9 @@
/**
* Returns true if m_message is complete.
*/
- bool is_matched() const
+ int is_matched() const
{
- return get_complete();
+ return get_complete() != NULL;
}
/**
@@ -1469,12 +1469,12 @@
m_successor = successor;
}
- bool is_first()
+ int is_first() const
{
return m_predecessor==NULL;
}
- bool is_last()
+ int is_last() const
{
return m_successor==NULL;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|