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

Proposed by Paul J. Lucas
Status: Merged
Approved by: Matthias Brantner
Approved revision: 11060
Merged at revision: 11223
Proposed branch: lp:~paul-lucas/zorba/pjl-misc
Merge into: lp:zorba
Diff against target: 19 lines (+2/-0)
1 file modified
src/diagnostics/xquery_exception.cpp (+2/-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+147012@code.launchpad.net

Commit message

CRITICAL FIX: Added missing applied_loc_ in copy ctor and operator=.

Description of the change

CRITICAL FIX: Added missing applied_loc_ in copy ctor and operator=.

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 :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job pjl-misc-2013-02-07T04-02-26.153Z 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/diagnostics/xquery_exception.cpp'
2--- src/diagnostics/xquery_exception.cpp 2013-02-07 01:28:43 +0000
3+++ src/diagnostics/xquery_exception.cpp 2013-02-07 03:17:22 +0000
4@@ -58,6 +58,7 @@
5 XQueryException::XQueryException( XQueryException const &from ) :
6 ZorbaException( from ),
7 source_loc_( from.source_loc_ ),
8+ applied_loc_( from.applied_loc_ ),
9 query_trace_( from.query_trace_ )
10 {
11 // This copy constructor isn't necessary: the compiler-generated default copy
12@@ -83,6 +84,7 @@
13 if ( &from != this ) {
14 ZorbaException::operator=( from );
15 source_loc_ = from.source_loc_;
16+ applied_loc_ = from.applied_loc_;
17 query_trace_ = from.query_trace_;
18 }
19 return *this;

Subscribers

People subscribed via source and target branches