Merge lp:~zorba-coders/zorba/do-not-destroy-annotations-twice into lp:zorba

[Ghislain Fourny]

No longer destroying built-in annotations twice.

No longer destroying built-in annotations twice.

[Zorba Build Bot (zorba-buildbot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/do-not-destroy-annotations-twice-2012-03-16T11-30-53.59Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job do-not-destroy-annotations-twice-2012-03-16T11-30-53.59Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Pending.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Ghislain Fourny (gislenius)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/do-not-destroy-annotations-twice-2012-04-10T13-17-05.159Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job do-not-destroy-annotations-twice-2012-04-10T13-17-05.159Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Approve, 2 Pending.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/do-not-destroy-annotations-twice-2012-04-11T18-12-53.25Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job do-not-destroy-annotations-twice-2012-04-11T18-12-53.25Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Approve, 2 Pending.

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/do-not-destroy-annotations-twice-2012-04-12T08-49-57.873Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job do-not-destroy-annotations-twice-2012-04-12T08-49-57.873Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/system/globalenv.cpp'
--- src/system/globalenv.cpp	2012-01-11 17:30:25 +0000
+++ src/system/globalenv.cpp	2012-03-16 10:11:26 +0000
@@ -153,8 +153,6 @@
 
   BuiltinFunctionLibrary::destroy();
 
-  AnnotationInternal::destroyBuiltIn();
-
   delete m_globalEnv;
 	m_globalEnv = NULL;