Zorba

Merge lp:~zorba-coders/zorba/bug1096718 into lp:zorba

  1. bug1096718
  2. Merge into trunk
Proposed by Rodolfo Ochoa
Status: Merged
Approved by: Matthias Brantner
Approved revision: 11164
Merged at revision: 11178
Proposed branch: lp:~zorba-coders/zorba/bug1096718
Merge into: lp:zorba
Diff against target: 15 lines (+3/-2)
1 file modified
src/context/root_static_context.cpp (+3/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug1096718
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Paul J. Lucas Approve
Review via email: mp+142407@code.launchpad.net

Commit message

fix for warnings

Description of the change

fix for warnings

To post a comment you must log in.
Revision history for this message
Rodolfo Ochoa (rodolfo-ochoa) wrote :

don't know why Launchpad doesn't show all the differences, but it also has:
36: #endif //WIN32

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/bug1096718-2013-01-11T01-02-05.868Z/log.html

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

Validation queue job bug1096718-2013-01-11T01-02-05.868Z 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/context/root_static_context.cpp'
2--- src/context/root_static_context.cpp 2013-01-08 08:34:08 +0000
3+++ src/context/root_static_context.cpp 2013-01-08 21:17:26 +0000
4@@ -94,8 +94,9 @@
5 }
6 }
7 #else
8- static void append_env_var(
9- char * env_var_name,
10+ static void append_env_var
11+ (
12+ const char * env_var_name,
13 std::vector<zstring>& pathsVector
14 )
15 {

Subscribers

People subscribed via source and target branches