[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-windows-compile into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-windows-compile into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-windows-compile/+merge/122976 -- https://code.launchpad.net/~zorba-coders/zorba/fix-windows-compile/+merge/122976 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-windows-compile into lp:zorba
Validation queue job fix-windows-compile-2012-09-10T09-39-55.557Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/fix-windows-compile/+merge/122976 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-windows-compile into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix-windows-compile-2012-09-10T09-39-55.557Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fix-windows-compile/+merge/122976 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-windows-compile into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-windows-compile into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-windows-compile/+merge/122976 -- https://code.launchpad.net/~zorba-coders/zorba/fix-windows-compile/+merge/122976 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-windows-compile into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix-windows-compile/+merge/122976 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-windows-compile into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-windows-compile into lp:zorba has been updated. Commit Message changed to: Fixed a typo and a portability issue that prevented Zorba from compiling correctly on Windows. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-windows-compile/+merge/122976 -- https://code.launchpad.net/~zorba-coders/zorba/fix-windows-compile/+merge/122976 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-windows-compile into lp:zorba
Review: Approve Both NMAKE and VS projects now build fine on my machine. -- https://code.launchpad.net/~zorba-coders/zorba/fix-windows-compile/+merge/122976 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-windows-compile into lp:zorba
Carlos Manuel Lopez has proposed merging
lp:~zorba-coders/zorba/fix-windows-compile into lp:zorba.
Requested reviews:
Zorba Coders (zorba-coders)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix-windows-compile/+merge/122976
Fixed a typo and a portability issue that prevented Zorba from compiling
correctly on Windows.
--
https://code.launchpad.net/~zorba-coders/zorba/fix-windows-compile/+merge/122976
Your team Zorba Coders is requested to review the proposed merge of
lp:~zorba-coders/zorba/fix-windows-compile into lp:zorba.
=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp 2012-09-05 12:22:23 +
+++ src/context/static_context.cpp 2012-09-05 23:31:14 +
@@ -538,7 +538,7 @@
#ifndef ZORBA_NO_FULL_TEXT
ns == ZORBA_FULL_TEXT_FN_NS ||
#endif /* ZORBA_NO_FULL_TEXT */
-#ifndef ZORBA_WITH_JSON
+#ifdef ZORBA_WITH_JSON
ns == JSONIQ_FN_NS ||
#endif /* ZORBA_WITH_JSON */
ns == ZORBA_XML_FN_NS);
=== modified file 'src/util/uuid.h'
--- src/util/uuid.h 2012-08-07 14:02:38 +
+++ src/util/uuid.h 2012-09-05 23:31:14 +
@@ -1,12 +1,12 @@
/*
* Copyright 2006-2008 The FLWOR Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -44,7 +44,7 @@
* section "4.1.2. Layout and Byte Order" due to possible padding.
*/
struct uuid {
- typedef uint8_t value_type;
+ typedef unsigned char value_type;
typedef value_type& reference;
typedef value_type const& const_reference;
typedef value_type* pointer;
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
