Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

[Paul J. Lucas]

s/0/npos/

This probably fixes some as-of-yet-undiscovered bug.

s/0/npos/

This probably fixes some as-of-yet-undiscovered bug.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2012-07-26T18-02-56.976Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job pjl-misc-2012-07-26T18-02-56.976Z 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: 1 Pending.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2012-07-26T18-59-00.462Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~paul-lucas/zorba/pjl-misc 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 pjl-misc-2012-07-26T18-59-00.462Z 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/pjl-misc-2012-07-26T21-41-59.384Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~paul-lucas/zorba/pjl-misc 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 pjl-misc-2012-07-26T21-41-59.384Z 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

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2012-07-27T22-38-57.279Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job pjl-misc-2012-07-27T22-38-57.279Z 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: 1 Approve.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2012-07-27T23-22-03.817Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job pjl-misc-2012-07-27T23-22-03.817Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/util/string/rstring.h'
--- src/util/string/rstring.h	2012-07-26 15:40:03 +0000
+++ src/util/string/rstring.h	2012-07-26 18:49:19 +0000
@@ -2349,7 +2349,8 @@
   data_( allocator_type() )
 {
   rep().construct( s.data() + check_pos( pos, s.size(), "rstring" ),
-                   s.data() + pos + limit_n( pos, s.size(), n ), allocator_type() );
+                   s.data() + pos + limit_n( pos, s.size(), n ),
+                   allocator_type() );
 }
 
 // RSTRING_C_SS_2ST_A_X
@@ -2377,7 +2378,7 @@
   data_( a )
 {
   // TODO: calls length unnecessarily when doing ptr_rep
-  rep().construct( s, s + (s ? traits_type::length( s ) : 0), a );
+  rep().construct( s, s + (s ? traits_type::length( s ) : npos), a );
 }
 
 // RSTRING_C_CP_ST_A_X