zorba-coders team mailing list archive

[Rodolfo Ochoa <rodolfo.ochoa@xxxxxxxxx>]

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

Requested reviews:
  Cezar Andrei (cezar-andrei)
  Matthias Brantner (matthias-brantner)
Related bugs:
  Bug #954724 in Zorba: "Resolve PHP bug for Windows on Release 2.2"
  https://bugs.launchpad.net/zorba/+bug/954724

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

- Fixed bug for PHP wrapper pointing to a wrong DLL name
- Fixed precompiled headers bug
- Fixed warning -> Conversion Int to Bool - Performance warning
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug954724/+merge/97344
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/api/identtypesimpl.cpp'
--- src/api/identtypesimpl.cpp	2012-03-05 23:44:54 +0000
+++ src/api/identtypesimpl.cpp	2012-03-14 05:23:21 +0000
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "stdafx.h"
 #include <zorba/identtypes.h>
 
 namespace zorba {

=== modified file 'src/precompiled/stdafx.h'
--- src/precompiled/stdafx.h	2011-09-02 19:58:59 +0000
+++ src/precompiled/stdafx.h	2012-03-14 05:23:21 +0000
@@ -80,7 +80,7 @@
 // #include "compiler/expression/ft_expr.h"
 // #include "compiler/expression/ftnode.h"
 // #include "compiler/parser/query_loc.h"
-// #include "util/cxx_util.h"
+  #include "util/cxx_util.h"
 // #include "util/indent.h"
 // #include "util/stl_util.h"
 // #include "diagnostics/xquery_diagnostics.h"
@@ -182,7 +182,7 @@
 // #include "context/stemmer_wrappers.h"
 // #include "context/uri_resolver.h"
 // #include "context/uri_resolver_wrapper.h"
-// //#include "diagnostics/assert.h"
+#include "diagnostics/assert.h"
 // #include "diagnostics/diagnostic.h"
 // #include "diagnostics/dict.h"
 // #include "diagnostics/dict_impl.h"
@@ -370,5 +370,8 @@
  #include "zorba/diagnostic_handler.h"
  #include "zorba/xquery_warning.h"
  #include "runtime/full_text/ftcontains_visitor.h"
+ #include "store/naive/naive_ft_token_iterator.h"
+ #include "store/api/ft_token_iterator.h"
+ #include "store/naive/ft_token_store.h"
 #endif
 /* vim:set et sw=2 ts=2: */

=== modified file 'src/store/naive/node_items.h'
--- src/store/naive/node_items.h	2012-03-13 12:21:59 +0000
+++ src/store/naive/node_items.h	2012-03-14 05:23:21 +0000
@@ -563,7 +563,7 @@
 
   void resetHaveReference() { theFlags &= ~HaveReference; }
 
-  bool isConnectorNode() const { return theFlags & IsConnectorNode; }
+  bool isConnectorNode() const { return (theFlags & IsConnectorNode) != 0; }
 
 #ifndef ZORBA_NO_FULL_TEXT
   FTTokenIterator_t getTokens( 

=== modified file 'swig/php/zorba_api.i'
--- swig/php/zorba_api.i	2012-01-20 13:37:12 +0000
+++ swig/php/zorba_api.i	2012-03-14 05:23:21 +0000
@@ -15,21 +15,9 @@
  */
 %begin %{
 #include <iostream>
-#if defined( _MSC_VER ) 
-#if (_MSC_VER >= 1600)
-  #define PHP_COMPILER_ID "VC10"
-#elif (_MSC_VER >= 1500)
-  #define PHP_COMPILER_ID "VC9"
-#elif (_MSC_VER >= 1400)
-  #define PHP_COMPILER_ID "VC8"
-#elif (_MSC_VER >= 1300)
-  #define PHP_COMPILER_ID "VC7"
-#elif (_MSC_VER >= 1200)
-  #define PHP_COMPILER_ID "VC6"
-#endif
-#endif
 
 #if defined(_MSC_VER)
+#define PHP_COMPILER_ID "VC9"
 #define strtoll _strtoi64
 #define strtoull _strtoui64
 #endif

=== modified file 'swig/php/zorba_api_wrapper.php'
--- swig/php/zorba_api_wrapper.php	2012-01-20 08:30:49 +0000
+++ swig/php/zorba_api_wrapper.php	2012-03-14 05:23:21 +0000
@@ -4,7 +4,7 @@
   $zorbaExtNotLoaded = "Zorba extension couldn't loaded";
   if(function_exists('dl')) {
     if(strtolower(substr(PHP_OS, 0, 3)) === 'win') {
-      if(!dl('php_zorba_api.dll')) {
+      if(!dl('zorba_api.dll')) {
         throw new Exception($zorbaExtNotLoaded);
       }  
     } else {