Merge lp:~verifydtapn-contributers/verifydtapn/nonBoostNonSegfault into lp:verifydtapn

Proposed by Peter Gjøl Jensen
Status: Merged
Approved by: Jiri Srba
Approved revision: 288
Merged at revision: 288
Proposed branch: lp:~verifydtapn-contributers/verifydtapn/nonBoostNonSegfault
Merge into: lp:verifydtapn
Diff against target: 51 lines (+3/-5)
4 files modified
src/DiscreteVerification/VerificationTypes/LivenessSearch.cpp (+1/-1)
src/DiscreteVerification/VerificationTypes/ReachabilitySearch.cpp (+0/-1)
src/DiscreteVerification/VerificationTypes/TimeDartLiveness.cpp (+1/-1)
src/DiscreteVerification/VerificationTypes/TimeDartReachabilitySearch.cpp (+1/-2)
To merge this branch: bzr merge lp:~verifydtapn-contributers/verifydtapn/nonBoostNonSegfault
Reviewer Review Type Date Requested Status
Jakob Taankvist Approve
Mathias Grund Sørensen Approve
Jiri Srba Approve
Review via email: mp+183361@code.launchpad.net

Description of the change

Removed deletes that were used for memory-leak-hunting and now are obsolete and causing segfaults at end of program. The deallocation is instead handled by the OS at program termination.

To post a comment you must log in.
Revision history for this message
Jiri Srba (srba) wrote :

Fixed the problem for me now.

review: Approve
Revision history for this message
Mathias Grund Sørensen (mathias.grund) :
review: Approve
Revision history for this message
Jakob Taankvist (jakob-taankvist) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/DiscreteVerification/VerificationTypes/LivenessSearch.cpp'
2--- src/DiscreteVerification/VerificationTypes/LivenessSearch.cpp 2013-08-13 21:01:42 +0000
3+++ src/DiscreteVerification/VerificationTypes/LivenessSearch.cpp 2013-09-01 17:40:23 +0000
4@@ -164,7 +164,7 @@
5 }
6
7 LivenessSearch::~LivenessSearch() {
8- // TODO Auto-generated destructor stub
9+
10 }
11
12 } /* namespace DiscreteVerification */
13
14=== modified file 'src/DiscreteVerification/VerificationTypes/ReachabilitySearch.cpp'
15--- src/DiscreteVerification/VerificationTypes/ReachabilitySearch.cpp 2013-08-13 21:01:42 +0000
16+++ src/DiscreteVerification/VerificationTypes/ReachabilitySearch.cpp 2013-09-01 17:40:23 +0000
17@@ -143,7 +143,6 @@
18 }
19
20 ReachabilitySearch::~ReachabilitySearch() {
21- delete pwList;
22 }
23
24 } /* namespace DiscreteVerification */
25
26=== modified file 'src/DiscreteVerification/VerificationTypes/TimeDartLiveness.cpp'
27--- src/DiscreteVerification/VerificationTypes/TimeDartLiveness.cpp 2013-08-13 21:01:42 +0000
28+++ src/DiscreteVerification/VerificationTypes/TimeDartLiveness.cpp 2013-09-01 17:40:23 +0000
29@@ -187,7 +187,7 @@
30 }
31
32 TimeDartLiveness::~TimeDartLiveness() {
33- delete pwList;
34+
35 }
36
37 } /* namespace DiscreteVerification */
38
39=== modified file 'src/DiscreteVerification/VerificationTypes/TimeDartReachabilitySearch.cpp'
40--- src/DiscreteVerification/VerificationTypes/TimeDartReachabilitySearch.cpp 2013-08-09 21:47:22 +0000
41+++ src/DiscreteVerification/VerificationTypes/TimeDartReachabilitySearch.cpp 2013-09-01 17:40:23 +0000
42@@ -120,8 +120,7 @@
43 }
44
45 TimeDartReachabilitySearch::~TimeDartReachabilitySearch() {
46- delete pwList;
47- delete tmpdart;
48+
49 }
50
51 } /* namespace DiscreteVerification */

Subscribers

People subscribed via source and target branches