zorba-coders team mailing list archive

[Rodolfo Ochoa <rodolfo.ochoa@xxxxxxxxx>]

Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug1052242 into lp:zorba.

Requested reviews:
  Chris Hillery (ceejatec)
Related bugs:
  Bug #1052242 in Zorba: "Windows compiling errors"
  https://bugs.launchpad.net/zorba/+bug/1052242

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1052242/+merge/124823

Fixing all compilation errors for Windows:
- fixing precompiled headers
- fixing errors on CSharp binding
- fixing errors on stdint.h
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1052242/+merge/124823
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/compiler/expression/expr_manager.cpp'
--- src/compiler/expression/expr_manager.cpp	2012-09-17 00:36:37 +0000
+++ src/compiler/expression/expr_manager.cpp	2012-09-17 23:35:21 +0000
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "stdafx.h"
 #include "expr_manager.h"
 
 #include "mem_manager.h"

=== modified file 'src/compiler/expression/mem_manager.cpp'
--- src/compiler/expression/mem_manager.cpp	2012-09-17 00:36:37 +0000
+++ src/compiler/expression/mem_manager.cpp	2012-09-17 23:35:21 +0000
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "stdafx.h"
 #include "mem_manager.h"
 
 #include <iostream>

=== modified file 'src/precompiled/stdafx.h'
--- src/precompiled/stdafx.h	2012-09-17 00:36:37 +0000
+++ src/precompiled/stdafx.h	2012-09-17 23:35:21 +0000
@@ -24,11 +24,8 @@
   #include <memory>
 
   #include <sstream>
-  #include <xfwrap>
-  #include <xfwrap1>
   #include <istream>
   #include <cstdio>
-  #include <xxshared>
   #include <crtdefs.h>
   #include <map>
   #include <set>
@@ -62,7 +59,6 @@
   #include "zorbatypes/rclock.h"
   #include "zorbatypes/schema_types.h"
   #include "zorbatypes/timezone.h"
-  #include "zorbatypes/transcoder.h"
   #include "zorbatypes/URI.h"
   #include "zorbatypes/xerces_xmlcharray.h"
   #include "zorbatypes/zorbatypes_decl.h"

=== modified file 'src/util/json_util.cpp'
--- src/util/json_util.cpp	2012-07-26 04:31:37 +0000
+++ src/util/json_util.cpp	2012-09-17 23:35:21 +0000
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "stdafx.h"
 #include <iomanip>
 #include <iostream>
 

=== modified file 'src/util/uuid.cpp'
--- src/util/uuid.cpp	2012-09-06 23:55:13 +0000
+++ src/util/uuid.cpp	2012-09-17 23:35:21 +0000
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "stdafx.h"
 #include <zorba/config.h>
 
 #include <cstdio>                       /* for sprintf(3) */

=== modified file 'src/zorbamisc/config/stdint.h'
--- src/zorbamisc/config/stdint.h	2012-09-17 00:36:37 +0000
+++ src/zorbamisc/config/stdint.h	2012-09-17 23:35:21 +0000
@@ -29,17 +29,17 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#ifndef _MSC_STDINT_H_ // [
+#define _MSC_STDINT_H_
+
 #ifndef _MSC_VER // [
 #include <stdint.h>
 #else
 
-#ifndef _MSC_STDINT_H_ // [
-#define _MSC_STDINT_H_
-
 // Exclude this file for Visual Studio > 2010 (_MSC_VER == 1600 for Visual Studio 2010)
-#if _MSC_VER <= 1600 // [
+//#if _MSC_VER <= 1600 // [
 
-#if _MSC_VER > 1000
+#if (_MSC_VER > 1000)
 #pragma once
 #endif
 
@@ -51,7 +51,7 @@
 #if (_MSC_VER < 1300) && defined(__cplusplus)
    extern "C++" {
 #endif
-#     include <wchar.h>
+#include <wchar.h>
 #if (_MSC_VER < 1300) && defined(__cplusplus)
    }
 #endif
@@ -60,7 +60,7 @@
 
 // 7.18.1.1 Exact-width integer types
 #ifndef U_HAVE_INT8_T
-#if _MSC_VER < 1600 // Visual Studio 10 already defines this type
+#if (_MSC_VER < 1600) // Visual Studio 10 already defines this type
 typedef __int8            int8_t;
 #endif //_MSC_VER < 1600
 #define U_HAVE_INT8_T  1
@@ -75,7 +75,9 @@
 typedef unsigned __int64  uint64_t;
 
 // 7.18.1.2 Minimum-width integer types
+#if (_MSC_VER < 1600) // Visual Studio 10 already defines this type
 typedef int8_t    int_least8_t;
+#endif
 typedef int16_t   int_least16_t;
 typedef int32_t   int_least32_t;
 typedef int64_t   int_least64_t;
@@ -239,7 +241,7 @@
 
 #endif // __STDC_CONSTANT_MACROS ]
 
-#endif // _MSC_VER < 1600 ]
+//#endif // _MSC_VER < 1600 ]
 
 #endif // _MSC_STDINT_H_ ]
 

=== modified file 'swig/csharp/CMakeLists.txt'
--- swig/csharp/CMakeLists.txt	2012-09-17 00:36:37 +0000
+++ swig/csharp/CMakeLists.txt	2012-09-17 23:35:21 +0000
@@ -32,7 +32,7 @@
 
   FILE(GLOB ZORBA_API_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_SOURCE_DIR}/../*.h")
   FOREACH(ZORBA_API_HEADER ${ZORBA_API_HEADERS})
-    CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/../${ZORBA_API_HEADER}"  "${CMAKE_CURRENT_BINARY_DIR}/${ZORBA_API_HEADER}" COPYONLY)
+    CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/../${ZORBA_API_HEADER}"  "${CMAKE_CURRENT_BINARY_DIR}/${ZORBA_API_HEADER}")
   ENDFOREACH(ZORBA_API_HEADER ${ZORBA_API_HEADERS})
 
   IF (MSVC_IDE)

=== modified file 'swig/csharp/zorba_api.i'
--- swig/csharp/zorba_api.i	2012-07-30 20:09:08 +0000
+++ swig/csharp/zorba_api.i	2012-09-17 23:35:21 +0000
@@ -14,4 +14,5 @@
  * limitations under the License.
  */
 
+%include "std_string.i"
 %include ../zorba_api.i