Zorba

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

  1. bug936688
  2. Merge into trunk
Proposed by Rodolfo Ochoa
Status: Merged
Approved by: Matthias Brantner
Approved revision: 10668
Merged at revision: 10671
Proposed branch: lp:~zorba-coders/zorba/bug936688
Merge into: lp:zorba
Diff against target: 71 lines (+6/-0)
6 files modified
src/api/transcode_streambuf.cpp (+1/-0)
src/unit_tests/json_parser.cpp (+1/-0)
src/unit_tests/test_icu_streambuf.cpp (+1/-0)
src/util/icu_streambuf.cpp (+1/-0)
src/util/json_parser.cpp (+1/-0)
src/util/mem_streambuf.cpp (+1/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug936688
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Cezar Andrei Approve
Review via email: mp+93888@code.launchpad.net

Commit message

Just some precompiled headers included

To post a comment you must log in.
Revision history for this message
Cezar Andrei (cezar-andrei) :
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/bug936688-2012-02-20T18-42-34.744Z/log.html

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

Validation queue job bug936688-2012-02-20T18-42-34.744Z 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/transcode_streambuf.cpp'
2--- src/api/transcode_streambuf.cpp 2012-02-04 01:26:18 +0000
3+++ src/api/transcode_streambuf.cpp 2012-02-20 18:35:26 +0000
4@@ -14,6 +14,7 @@
5 * limitations under the License.
6 */
7
8+#include "stdafx.h"
9 #include <zorba/transcode_stream.h>
10
11 #include "util/transcode_streambuf.h"
12
13=== modified file 'src/unit_tests/json_parser.cpp'
14--- src/unit_tests/json_parser.cpp 2011-12-16 22:12:42 +0000
15+++ src/unit_tests/json_parser.cpp 2012-02-20 18:35:26 +0000
16@@ -14,6 +14,7 @@
17 * limitations under the License.
18 */
19
20+#include "stdafx.h"
21 #include <sstream>
22
23 #include "util/json_parser.h"
24
25=== modified file 'src/unit_tests/test_icu_streambuf.cpp'
26--- src/unit_tests/test_icu_streambuf.cpp 2012-01-14 01:05:46 +0000
27+++ src/unit_tests/test_icu_streambuf.cpp 2012-02-20 18:35:26 +0000
28@@ -14,6 +14,7 @@
29 * limitations under the License.
30 */
31
32+#include "stdafx.h"
33 #include <fstream>
34 #include <iostream>
35 #include <sstream>
36
37=== modified file 'src/util/icu_streambuf.cpp'
38--- src/util/icu_streambuf.cpp 2012-02-07 18:33:28 +0000
39+++ src/util/icu_streambuf.cpp 2012-02-20 18:35:26 +0000
40@@ -14,6 +14,7 @@
41 * limitations under the License.
42 */
43
44+#include "stdafx.h"
45 #define ZORBA_DEBUG_ICU_STREAMBUF 0
46
47 #ifdef ZORBA_DEBUG_ICU_STREAMBUF
48
49=== modified file 'src/util/json_parser.cpp'
50--- src/util/json_parser.cpp 2012-01-26 01:35:11 +0000
51+++ src/util/json_parser.cpp 2012-02-20 18:35:26 +0000
52@@ -14,6 +14,7 @@
53 * limitations under the License.
54 */
55
56+#include "stdafx.h"
57 #include "diagnostics/assert.h"
58
59 #include "ascii_util.h"
60
61=== modified file 'src/util/mem_streambuf.cpp'
62--- src/util/mem_streambuf.cpp 2011-12-20 18:29:15 +0000
63+++ src/util/mem_streambuf.cpp 2012-02-20 18:35:26 +0000
64@@ -14,6 +14,7 @@
65 * limitations under the License.
66 */
67
68+#include "stdafx.h"
69 #include <cstring> /* for memcpy(3) */
70
71 #include "diagnostics/assert.h"

Subscribers

People subscribed via source and target branches