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
=== modified file 'src/functions/func_serialize_impl.cpp'
--- src/functions/func_serialize_impl.cpp 2012-01-11 17:30:25 +0000
+++ src/functions/func_serialize_impl.cpp 2012-02-02 21:21:20 +0000
@@ -13,6 +13,7 @@
13 * See the License for the specific language governing permissions and13 * See the License for the specific language governing permissions and
14 * limitations under the License.14 * limitations under the License.
15 */15 */
16#include "stdafx.h"
16#include "functions/function.h"17#include "functions/function.h"
17#include "functions/func_parsing_and_serializing.h"18#include "functions/func_parsing_and_serializing.h"
1819
1920
=== modified file 'src/unit_tests/stemmer.cpp'
--- src/unit_tests/stemmer.cpp 2012-02-02 09:56:52 +0000
+++ src/unit_tests/stemmer.cpp 2012-02-02 21:21:20 +0000
@@ -14,6 +14,7 @@
14 * limitations under the License.14 * limitations under the License.
15 */15 */
1616
17#include "stdafx.h"
17#include <cassert>18#include <cassert>
18#include <iostream>19#include <iostream>
1920
2021
=== modified file 'src/unit_tests/string.cpp'
--- src/unit_tests/string.cpp 2012-02-02 09:56:52 +0000
+++ src/unit_tests/string.cpp 2012-02-02 21:21:20 +0000
@@ -14,6 +14,7 @@
14 * limitations under the License.14 * limitations under the License.
15 */15 */
1616
17#include "stdafx.h"
17#include <cstring>18#include <cstring>
18#include <cwchar>19#include <cwchar>
19#include <sstream>20#include <sstream>
2021
=== modified file 'src/unit_tests/string_instantiate.cpp'
--- src/unit_tests/string_instantiate.cpp 2012-02-02 09:56:52 +0000
+++ src/unit_tests/string_instantiate.cpp 2012-02-02 21:21:20 +0000
@@ -14,6 +14,7 @@
14 * limitations under the License.14 * limitations under the License.
15 */15 */
1616
17#include "stdafx.h"
17#include <cassert>18#include <cassert>
18#include <string>19#include <string>
1920
2021
=== modified file 'src/unit_tests/thesaurus.cpp'
--- src/unit_tests/thesaurus.cpp 2012-02-02 09:56:52 +0000
+++ src/unit_tests/thesaurus.cpp 2012-02-02 21:21:20 +0000
@@ -14,6 +14,7 @@
14 * limitations under the License.14 * limitations under the License.
15 */15 */
1616
17#include "stdafx.h"
17#include <cassert>18#include <cassert>
18#include <iostream>19#include <iostream>
19#include <list>20#include <list>
2021
=== modified file 'src/unit_tests/tokenizer.cpp'
--- src/unit_tests/tokenizer.cpp 2012-02-02 09:56:52 +0000
+++ src/unit_tests/tokenizer.cpp 2012-02-02 21:21:20 +0000
@@ -14,6 +14,7 @@
14 * limitations under the License.14 * limitations under the License.
15 */15 */
1616
17#include "stdafx.h"
17#include <algorithm>18#include <algorithm>
18#include <cctype>19#include <cctype>
19#include <cstdlib>20#include <cstdlib>
2021
=== modified file 'src/unit_tests/unique_ptr.cpp'
--- src/unit_tests/unique_ptr.cpp 2012-02-02 09:56:52 +0000
+++ src/unit_tests/unique_ptr.cpp 2012-02-02 21:21:20 +0000
@@ -14,6 +14,7 @@
14 * limitations under the License.14 * limitations under the License.
15 */15 */
1616
17#include "stdafx.h"
17#include <iostream>18#include <iostream>
18#include <iomanip>19#include <iomanip>
1920

Subscribers

People subscribed via source and target branches