Zorba

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

  1. pjl-misc
  2. Merge into trunk
Proposed by Paul J. Lucas
Status: Merged
Approved by: Matthias Brantner
Approved revision: 11039
Merged at revision: 11187
Proposed branch: lp:~paul-lucas/zorba/pjl-misc
Merge into: lp:zorba
Diff against target: 11 lines (+1/-0)
1 file modified
src/util/cxx_util.h (+1/-0)
To merge this branch: bzr merge lp:~paul-lucas/zorba/pjl-misc
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Paul J. Lucas Approve
Review via email: mp+143521@code.launchpad.net

Commit message

Fixes zorba_nullptr linker error on Linux.

Description of the change

Fixes zorba_nullptr linker error on Linux.

To post a comment you must log in.
Revision history for this message
Paul J. Lucas (paul-lucas) :
review: Approve
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-01-16T16-02-50.827Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job pjl-misc-2013-01-16T16-02-50.827Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/util/cxx_util.h'
2--- src/util/cxx_util.h 2013-01-15 19:21:49 +0000
3+++ src/util/cxx_util.h 2013-01-16 14:54:26 +0000
4@@ -54,6 +54,7 @@
5 * We also use a singleton object since using multiple instances as shown in
6 * Bjarne's paper has a slight performance penalty.
7 */
8+ZORBA_DLL_PUBLIC
9 extern zorba::nullptr_type const zorba_nullptr;
10
11 #define nullptr ::zorba_nullptr

Subscribers

People subscribed via source and target branches