zorba-coders team mailing list archive

[Rodolfo Ochoa <rodolfo.ochoa@xxxxxxxxx>]

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

Requested reviews:
  Cezar Andrei (cezar-andrei)
  Chris Hillery (ceejatec)

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

Fix for precompiled headers on Windows
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1024580/+merge/114966
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/compiler/expression/expr_utils.cpp'
--- src/compiler/expression/expr_utils.cpp	2012-05-23 21:43:47 +0000
+++ src/compiler/expression/expr_utils.cpp	2012-07-14 00:42:20 +0000
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+#include "stdafx.h"
 #include "compiler/expression/expr_utils.h"
 #include "zorbaserialization/serialize_basic_types.h"
 

=== modified file 'src/compiler/expression/json_exprs.cpp'
--- src/compiler/expression/json_exprs.cpp	2012-07-11 15:38:39 +0000
+++ src/compiler/expression/json_exprs.cpp	2012-07-14 00:42:20 +0000
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+#include "stdafx.h"
 #include "compiler/expression/json_exprs.h"
 #include "compiler/expression/expr_visitor.h"
 

=== modified file 'src/precompiled/stdafx.h'
--- src/precompiled/stdafx.h	2012-07-12 17:29:55 +0000
+++ src/precompiled/stdafx.h	2012-07-14 00:42:20 +0000
@@ -72,10 +72,8 @@
   #include "zorbautils/hashfun.h"
   #include "zorbautils/hashmap.h"
   #include "zorbautils/hashmap_itemp.h"
-  #include "zorbautils/hashmap_str_obj.h"
   #include "zorbautils/hashmap_zstring.h"
   #include "zorbautils/hashset.h"
-  #include "zorbautils/hashset_itemh.h"
   #include "zorbautils/latch.h"
   #include "zorbautils/locale.h"
   #include "zorbautils/lock.h"

=== modified file 'src/runtime/full_text/ft_module_impl.cpp'
--- src/runtime/full_text/ft_module_impl.cpp	2012-07-12 17:29:55 +0000
+++ src/runtime/full_text/ft_module_impl.cpp	2012-07-14 00:42:20 +0000
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "stdafx.h"
 #include <zorba/config.h>
 
 //
@@ -23,7 +24,6 @@
 //
 #ifndef ZORBA_NO_FULL_TEXT
 
-#include "stdafx.h"
 
 #include <limits>
 #include <typeinfo>

=== modified file 'src/runtime/full_text/ft_module_util.cpp'
--- src/runtime/full_text/ft_module_util.cpp	2012-07-11 15:38:39 +0000
+++ src/runtime/full_text/ft_module_util.cpp	2012-07-14 00:42:20 +0000
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "stdafx.h"
 #include "api/unmarshaller.h"
 #include "context/static_context.h"
 #include "store/api/item_factory.h"

=== modified file 'src/runtime/json/jsoniq_functions_impl.cpp'
--- src/runtime/json/jsoniq_functions_impl.cpp	2012-07-11 15:38:39 +0000
+++ src/runtime/json/jsoniq_functions_impl.cpp	2012-07-14 00:42:20 +0000
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include "stdafx.h"
 #include <zorba/config.h>
 
 #ifdef ZORBA_WITH_JSON
 
-#include "stdafx.h"
 
 #include <sstream>
 

=== modified file 'src/util/base64_util.cpp'
--- src/util/base64_util.cpp	2012-06-20 22:26:09 +0000
+++ src/util/base64_util.cpp	2012-07-14 00:42:20 +0000
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "stdafx.h"
 #include <algorithm>
 #include <cstring>