Zorba

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

  1. bug1024580
  2. Merge into trunk
Proposed by Rodolfo Ochoa
Status: Merged
Approved by: Chris Hillery
Approved revision: 10939
Merged at revision: 10938
Proposed branch: lp:~zorba-coders/zorba/bug1024580
Merge into: lp:zorba
Diff against target: 108 lines (+6/-7)
7 files modified
src/compiler/expression/expr_utils.cpp (+1/-1)
src/compiler/expression/json_exprs.cpp (+1/-1)
src/precompiled/stdafx.h (+0/-3)
src/runtime/full_text/ft_module_impl.cpp (+1/-1)
src/runtime/full_text/ft_module_util.cpp (+1/-0)
src/runtime/json/jsoniq_functions_impl.cpp (+1/-1)
src/util/base64_util.cpp (+1/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug1024580
Reviewer Review Type Date Requested Status
Rodolfo Ochoa Approve
Chris Hillery Approve
Review via email: mp+114966@code.launchpad.net

Commit message

Fix for precompiled headers on Windows

Description of the change

Fix for precompiled headers on Windows

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
lp:~zorba-coders/zorba/bug1024580 updated
10939. By Rodolfo Ochoa

Setting the bug number to commit

Revision history for this message
Rodolfo Ochoa (rodolfo-ochoa) :
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/bug1024580-2012-07-14T01-20-15.753Z/log.html

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

Validation queue job bug1024580-2012-07-14T01-20-15.753Z 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/compiler/expression/expr_utils.cpp'
2--- src/compiler/expression/expr_utils.cpp 2012-05-23 21:43:47 +0000
3+++ src/compiler/expression/expr_utils.cpp 2012-07-14 00:48:22 +0000
4@@ -13,7 +13,7 @@
5 * See the License for the specific language governing permissions and
6 * limitations under the License.
7 */
8-
9+#include "stdafx.h"
10 #include "compiler/expression/expr_utils.h"
11 #include "zorbaserialization/serialize_basic_types.h"
12
13
14=== modified file 'src/compiler/expression/json_exprs.cpp'
15--- src/compiler/expression/json_exprs.cpp 2012-07-11 15:38:39 +0000
16+++ src/compiler/expression/json_exprs.cpp 2012-07-14 00:48:22 +0000
17@@ -13,7 +13,7 @@
18 * See the License for the specific language governing permissions and
19 * limitations under the License.
20 */
21-
22+#include "stdafx.h"
23 #include "compiler/expression/json_exprs.h"
24 #include "compiler/expression/expr_visitor.h"
25
26
27=== modified file 'src/precompiled/stdafx.h'
28--- src/precompiled/stdafx.h 2012-07-12 17:29:55 +0000
29+++ src/precompiled/stdafx.h 2012-07-14 00:48:22 +0000
30@@ -16,7 +16,6 @@
31 */
32
33 #ifdef STDAFX
34-
35 #include <fstream>
36 #include <iostream>
37 #include <stdexcept>
38@@ -72,10 +71,8 @@
39 #include "zorbautils/hashfun.h"
40 #include "zorbautils/hashmap.h"
41 #include "zorbautils/hashmap_itemp.h"
42- #include "zorbautils/hashmap_str_obj.h"
43 #include "zorbautils/hashmap_zstring.h"
44 #include "zorbautils/hashset.h"
45- #include "zorbautils/hashset_itemh.h"
46 #include "zorbautils/latch.h"
47 #include "zorbautils/locale.h"
48 #include "zorbautils/lock.h"
49
50=== modified file 'src/runtime/full_text/ft_module_impl.cpp'
51--- src/runtime/full_text/ft_module_impl.cpp 2012-07-12 17:29:55 +0000
52+++ src/runtime/full_text/ft_module_impl.cpp 2012-07-14 00:48:22 +0000
53@@ -14,6 +14,7 @@
54 * limitations under the License.
55 */
56
57+#include "stdafx.h"
58 #include <zorba/config.h>
59
60 //
61@@ -23,7 +24,6 @@
62 //
63 #ifndef ZORBA_NO_FULL_TEXT
64
65-#include "stdafx.h"
66
67 #include <limits>
68 #include <typeinfo>
69
70=== modified file 'src/runtime/full_text/ft_module_util.cpp'
71--- src/runtime/full_text/ft_module_util.cpp 2012-07-11 15:38:39 +0000
72+++ src/runtime/full_text/ft_module_util.cpp 2012-07-14 00:48:22 +0000
73@@ -14,6 +14,7 @@
74 * limitations under the License.
75 */
76
77+#include "stdafx.h"
78 #include "api/unmarshaller.h"
79 #include "context/static_context.h"
80 #include "store/api/item_factory.h"
81
82=== modified file 'src/runtime/json/jsoniq_functions_impl.cpp'
83--- src/runtime/json/jsoniq_functions_impl.cpp 2012-07-11 15:38:39 +0000
84+++ src/runtime/json/jsoniq_functions_impl.cpp 2012-07-14 00:48:22 +0000
85@@ -13,11 +13,11 @@
86 * See the License for the specific language governing permissions and
87 * limitations under the License.
88 */
89+#include "stdafx.h"
90 #include <zorba/config.h>
91
92 #ifdef ZORBA_WITH_JSON
93
94-#include "stdafx.h"
95
96 #include <sstream>
97
98
99=== modified file 'src/util/base64_util.cpp'
100--- src/util/base64_util.cpp 2012-06-20 22:26:09 +0000
101+++ src/util/base64_util.cpp 2012-07-14 00:48:22 +0000
102@@ -14,6 +14,7 @@
103 * limitations under the License.
104 */
105
106+#include "stdafx.h"
107 #include <algorithm>
108 #include <cstring>
109

Subscribers

People subscribed via source and target branches