Zorba

Merge lp:~zorba-coders/zorba/feature-fix-internal-audit-constants into lp:zorba

  1. feature-fix-internal-audit-constants
  2. Merge into trunk
Proposed by Till Westmann
Status: Merged
Approved by: Matthias Brantner
Approved revision: 11351
Merged at revision: 11353
Proposed branch: lp:~zorba-coders/zorba/feature-fix-internal-audit-constants
Merge into: lp:zorba
Diff against target: 24 lines (+3/-3)
2 files modified
src/api/auditprops_cpp.xq (+1/-1)
src/api/pregenerated/auditprops.cpp (+2/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/feature-fix-internal-audit-constants
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Till Westmann Approve
Review via email: mp+157676@code.launchpad.net

Commit message

change name of generated constants to avoid conflicts

Description of the change

If we create an audit property with the last segment being "path" we get a conflict for the generated c++ constants. This conflict is avoided with this change.

To post a comment you must log in.
Revision history for this message
Till Westmann (tillw) :
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/feature-fix-internal-audit-constants-2013-04-08T15-44-45.985Z/log.html

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

Validation queue job feature-fix-internal-audit-constants-2013-04-08T15-44-45.985Z 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, Needs Information < 1, Resubmit < 1. Got: 1 Approve, 1 Pending.

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/feature-fix-internal-audit-constants-2013-04-09T00-50-45.574Z/log.html

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

Validation queue job feature-fix-internal-audit-constants-2013-04-09T00-50-45.574Z 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/api/auditprops_cpp.xq'
2--- src/api/auditprops_cpp.xq 2013-04-03 22:52:25 +0000
3+++ src/api/auditprops_cpp.xq 2013-04-08 15:44:24 +0000
4@@ -28,7 +28,7 @@
5 declare function local:group-path($group-spec as xs:string*) as xs:string
6 {
7 let $name := string-join($group-spec ! upper-case(.), "_")
8-let $path := $name || "_PATH"
9+let $path := $name || "_"
10 return
11 'const char* '
12 || $path || "[]"
13
14=== modified file 'src/api/pregenerated/auditprops.cpp'
15--- src/api/pregenerated/auditprops.cpp 2013-04-03 22:52:25 +0000
16+++ src/api/pregenerated/auditprops.cpp 2013-04-08 15:44:24 +0000
17@@ -1,5 +1,5 @@
18-const char* XQUERY_COMPILATION_PATH[] = { "xquery", "compilation" };
19-const PropertyGroupImpl XQUERY_COMPILATION(2, XQUERY_COMPILATION_PATH);
20+const char* XQUERY_COMPILATION_[] = { "xquery", "compilation" };
21+const PropertyGroupImpl XQUERY_COMPILATION(2, XQUERY_COMPILATION_);
22 const PropertyImpl XQUERY_COMPILATION_FILENAME(XQUERY_COMPILATION, "filename", 0, Property::STRING);
23 const PropertyImpl XQUERY_COMPILATION_PARSE_DURATION(XQUERY_COMPILATION, "parse-duration", 1, Property::INT);
24 const PropertyImpl XQUERY_COMPILATION_TRANSLATION_DURATION(XQUERY_COMPILATION, "translation-duration", 2, Property::INT);

Subscribers

People subscribed via source and target branches