Zorba

Merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba

  1. bug-fixing
  2. Merge into trunk
Proposed by Matthias Brantner
Status: Merged
Approved by: Matthias Brantner
Approved revision: no longer in the source branch.
Merged at revision: 10577
Proposed branch: lp:~matthias-brantner/zorba/bug-fixing
Merge into: lp:zorba
Diff against target: 12 lines (+1/-1)
1 file modified
src/api/serialization/serializer.cpp (+1/-1)
To merge this branch: bzr merge lp:~matthias-brantner/zorba/bug-fixing
Reviewer Review Type Date Requested Status
Juan Zacarias Approve
Matthias Brantner Approve
Review via email: mp+84817@code.launchpad.net

Commit message

fix build on windows

Description of the change

fix windows build

To post a comment you must log in.
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Juan Zacarias (juan457) :
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/bug-fixing-2011-12-07T18-19-15.253Z/log.html

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

Validation queue job bug-fixing-2011-12-07T18-19-15.253Z is finished. The final status was:

All tests succeeded!

lp:~matthias-brantner/zorba/bug-fixing updated
10577. By Matthias Brantner

fix build on windows Approved: Juan Zacarias, Matthias Brantner

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/api/serialization/serializer.cpp'
2--- src/api/serialization/serializer.cpp 2011-11-30 18:27:04 +0000
3+++ src/api/serialization/serializer.cpp 2011-12-07 18:07:13 +0000
4@@ -1709,7 +1709,7 @@
5 is.clear(); // clear eofbit
6 if (item->isSeekable())
7 {
8- if (pos != 0 && pos != -1)
9+ if (pos)
10 {
11 is.exceptions(is.exceptions() | std::ios::failbit);
12 is.seekg(pos, std::ios::beg);

Subscribers

People subscribed via source and target branches