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

[Paul J. Lucas]

Removed ZORBA_ERROR_DESC_OSS (finally, no longer used anywhere).

Removed ZORBA_ERROR_DESC_OSS (finally, no longer used anywhere).

[Paul J. Lucas (paul-lucas)]

review: 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-01-22T18-24-45.13Z/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:275 (message):
  Validation queue job pjl-misc-2013-01-22T18-24-45.13Z is finished. The
  final status was:

  3 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-01-23T00-05-38.536Z/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:275 (message):
  Validation queue job pjl-misc-2013-01-23T00-05-38.536Z 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-2013-01-23T01-52-50.057Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job pjl-misc-2013-01-23T01-52-50.057Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/diagnostics/xquery_diagnostics.h'
--- src/diagnostics/xquery_diagnostics.h	2013-01-12 00:48:23 +0000
+++ src/diagnostics/xquery_diagnostics.h	2013-01-22 18:19:27 +0000
@@ -123,14 +123,7 @@
   warnings_type warnings_;
 };
 
-////////// TEMPORARY TRANSITION MACROS: THESE WILL BE REMOVED /////////////////
-
-#define ZORBA_ERROR_DESC_OSS(LOCALNAME,MSG) \
-  do { \
-    std::ostringstream oss; \
-    oss << MSG; \
-    throw XQUERY_EXCEPTION( LOCALNAME, ERROR_PARAMS( oss.str() ) ); \
-  } while (0)
+///////////////////////////////////////////////////////////////////////////////
 
 } // namespace zorba