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

[Paul J. Lucas]

Removed unncessary (and now wrong) cast.

Removed unncessary (and now wrong) cast.

[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-2013-05-28T17-34-44.172Z/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:281 (message):
  Validation queue job pjl-misc-2013-05-28T17-34-44.172Z is finished. The
  final status was:

  15 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-2013-05-29T00-12-41.575Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job pjl-misc-2013-05-29T00-12-41.575Z 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, Needs Information < 1, Resubmit < 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-2013-05-29T01-02-27.358Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job pjl-misc-2013-05-29T01-02-27.358Z is finished. The final status was:

All tests succeeded!

=== modified file 'include/zorba/time.h'
--- include/zorba/time.h	2013-03-13 16:17:38 +0000
+++ include/zorba/time.h	2013-05-28 17:09:36 +0000
@@ -57,7 +57,6 @@
     VE,   ///< Vikrama Era
     VS    ///< Vikrama Samvat Era
   };
-
 } // namespace calendar
 
 ///////////////////////////////////////////////////////////////////////////////
 
=== modified file 'src/store/naive/atomic_items.cpp'
--- src/store/naive/atomic_items.cpp	2013-05-24 22:52:47 +0000
+++ src/store/naive/atomic_items.cpp	2013-05-28 17:09:36 +0000
@@ -150,10 +150,9 @@
   case store::XS_NON_NEGATIVE_INTEGER:
   case store::XS_POSITIVE_INTEGER:
   {
-    const IntegerItem* item = static_cast<const IntegerItem*>(item1);
     try
     {
-      longValue = item->getLongValue();
+      longValue = item1->getLongValue();
       GET_FACTORY().createLong(result, longValue);
     }
     catch (std::range_error const&)