Merge lp:~paul-lucas/zorba/bug-944826 into lp:zorba

[Paul J. Lucas]

Set dispose_data_using_delete_ = false in reserve().

Set dispose_data_using_delete_ = false in reserve().

[Paul J. Lucas (paul-lucas)]

I forgot to to the commit before submitting the first merge proposal.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-944826-2012-03-02T16-48-06.224Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-944826-2012-03-02T16-48-06.224Z 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. Got: 3 Pending.

[Matthias Brantner (matthias-brantner)]

review: Approve

[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/bug-944826-2012-03-04T07-57-03.742Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~paul-lucas/zorba/bug-944826 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug-944826-2012-03-04T07-57-03.742Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-944826-2012-03-06T18-52-59.572Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-944826-2012-03-06T18-52-59.572Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/util/string/ptr_rep.tcc'
--- src/util/string/ptr_rep.tcc	2011-07-16 23:23:56 +0000
+++ src/util/string/ptr_rep.tcc	2012-03-02 15:35:23 +0000
@@ -169,6 +169,7 @@
     pointer const p = clone_data_only( alloc, cap );
     dispose_data_only( alloc );
     p_ = p;
+    dispose_data_using_delete_ = false;
     this->cap_ = cap;
   }
   return this;