Merge lp:~zorba-coders/zorba/sync-code-hashmap-fix into lp:zorba

Proposed by Ghislain Fourny
Status: Superseded
Proposed branch: lp:~zorba-coders/zorba/sync-code-hashmap-fix
Merge into: lp:zorba
Diff against target: 20 lines (+6/-4)
1 file modified
src/zorbautils/hashmap.h (+6/-4)
To merge this branch: bzr merge lp:~zorba-coders/zorba/sync-code-hashmap-fix
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Matthias Brantner Pending
Review via email: mp+112996@code.launchpad.net

Commit message

Fixed a bug preventing from compiling Zorba single-threadedly.

Description of the change

Fixed a bug preventing from compiling Zorba single-threadedly.

To post a comment you must log in.
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job sync-code-hashmap-fix-2012-07-02T12-19-03.56Z is finished. The final status was:

All tests succeeded!

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

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Pending.

Revision history for this message
Markos Zaharioudakis (markos-za) :
review: Approve

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/zorbautils/hashmap.h'
2--- src/zorbautils/hashmap.h 2012-06-29 18:19:56 +0000
3+++ src/zorbautils/hashmap.h 2012-07-02 09:45:27 +0000
4@@ -311,10 +311,12 @@
5 /*******************************************************************************
6
7 ********************************************************************************/
8-Mutex* get_mutex() const
9-{
10- return theMutexp;
11-}
12+SYNC_CODE( \
13+Mutex* get_mutex() const \
14+{ \
15+ return theMutexp; \
16+} \
17+)
18
19
20 /*******************************************************************************

Subscribers

People subscribed via source and target branches