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

Proposed by Rodolfo Ochoa
Status: Merged
Approved by: Rodolfo Ochoa
Approved revision: 10640
Merged at revision: 10646
Proposed branch: lp:~zorba-coders/zorba/bug925716
Merge into: lp:zorba
Diff against target: 82 lines (+7/-0)
7 files modified
src/functions/func_serialize_impl.cpp (+1/-0)
src/unit_tests/stemmer.cpp (+1/-0)
src/unit_tests/string.cpp (+1/-0)
src/unit_tests/string_instantiate.cpp (+1/-0)
src/unit_tests/thesaurus.cpp (+1/-0)
src/unit_tests/tokenizer.cpp (+1/-0)
src/unit_tests/unique_ptr.cpp (+1/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug925716
Reviewer Review Type Date Requested Status
Cezar Andrei Approve
Matthias Brantner Approve
Juan Zacarias Pending
Review via email: mp+91351@code.launchpad.net

Commit message

added
#include "stdafx.h"

and changed uri_util.h having
ZORBA_DLL_PUBLIC extern char const uri_safe[];
ZORBA_DLL_PUBLIC extern signed char const hex2dec[];

Description of the change

added
#include "stdafx.h"

and changed uri_util.h having
ZORBA_DLL_PUBLIC extern char const uri_safe[];
ZORBA_DLL_PUBLIC extern signed char const hex2dec[];

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

uri_util.h is already fixed in trunk, so, only headers

Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Cezar Andrei (cezar-andrei) wrote :

Approve.

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

The attempt to merge lp:~zorba-coders/zorba/bug925716 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug925716-2012-02-04T02-18-38.412Z is finished. The
  final status was:

  3 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

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

The attempt to merge lp:~zorba-coders/zorba/bug925716 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug925716-2012-02-04T04-13-52.039Z is finished. The
  final status was:

  3 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

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

The attempt to merge lp:~zorba-coders/zorba/bug925716 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug925716-2012-02-05T04-30-21.875Z is finished. The
  final status was:

  3 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

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 bug925716-2012-02-06T00-37-58.79Z 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/functions/func_serialize_impl.cpp'
2--- src/functions/func_serialize_impl.cpp 2012-01-11 17:30:25 +0000
3+++ src/functions/func_serialize_impl.cpp 2012-02-02 21:21:20 +0000
4@@ -13,6 +13,7 @@
5 * See the License for the specific language governing permissions and
6 * limitations under the License.
7 */
8+#include "stdafx.h"
9 #include "functions/function.h"
10 #include "functions/func_parsing_and_serializing.h"
11
12
13=== modified file 'src/unit_tests/stemmer.cpp'
14--- src/unit_tests/stemmer.cpp 2012-02-02 09:56:52 +0000
15+++ src/unit_tests/stemmer.cpp 2012-02-02 21:21:20 +0000
16@@ -14,6 +14,7 @@
17 * limitations under the License.
18 */
19
20+#include "stdafx.h"
21 #include <cassert>
22 #include <iostream>
23
24
25=== modified file 'src/unit_tests/string.cpp'
26--- src/unit_tests/string.cpp 2012-02-02 09:56:52 +0000
27+++ src/unit_tests/string.cpp 2012-02-02 21:21:20 +0000
28@@ -14,6 +14,7 @@
29 * limitations under the License.
30 */
31
32+#include "stdafx.h"
33 #include <cstring>
34 #include <cwchar>
35 #include <sstream>
36
37=== modified file 'src/unit_tests/string_instantiate.cpp'
38--- src/unit_tests/string_instantiate.cpp 2012-02-02 09:56:52 +0000
39+++ src/unit_tests/string_instantiate.cpp 2012-02-02 21:21:20 +0000
40@@ -14,6 +14,7 @@
41 * limitations under the License.
42 */
43
44+#include "stdafx.h"
45 #include <cassert>
46 #include <string>
47
48
49=== modified file 'src/unit_tests/thesaurus.cpp'
50--- src/unit_tests/thesaurus.cpp 2012-02-02 09:56:52 +0000
51+++ src/unit_tests/thesaurus.cpp 2012-02-02 21:21:20 +0000
52@@ -14,6 +14,7 @@
53 * limitations under the License.
54 */
55
56+#include "stdafx.h"
57 #include <cassert>
58 #include <iostream>
59 #include <list>
60
61=== modified file 'src/unit_tests/tokenizer.cpp'
62--- src/unit_tests/tokenizer.cpp 2012-02-02 09:56:52 +0000
63+++ src/unit_tests/tokenizer.cpp 2012-02-02 21:21:20 +0000
64@@ -14,6 +14,7 @@
65 * limitations under the License.
66 */
67
68+#include "stdafx.h"
69 #include <algorithm>
70 #include <cctype>
71 #include <cstdlib>
72
73=== modified file 'src/unit_tests/unique_ptr.cpp'
74--- src/unit_tests/unique_ptr.cpp 2012-02-02 09:56:52 +0000
75+++ src/unit_tests/unique_ptr.cpp 2012-02-02 21:21:20 +0000
76@@ -14,6 +14,7 @@
77 * limitations under the License.
78 */
79
80+#include "stdafx.h"
81 #include <iostream>
82 #include <iomanip>
83

Subscribers

People subscribed via source and target branches