zorba-coders team mailing list archive

[Carlos Manuel Lopez <charlie.lobo@xxxxxxxxx>]

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 +0000
+++ src/context/static_context.cpp	2012-09-05 23:31:14 +0000
@@ -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 +0000
+++ src/util/uuid.h	2012-09-05 23:31:14 +0000
@@ -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;