zorba-coders team mailing list archive

[Chris Hillery <chillery+launchpad@xxxxxxxxx>]

Chris Hillery has proposed merging lp:~zorba-coders/zorba/broken-code into lp:zorba.

Requested reviews:
  Zorba Coders (zorba-coders)

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

This commit also requires merging https://code.launchpad.net/~zorba-coders/zorba/broken-test/+merge/172436.
-- 
https://code.launchpad.net/~zorba-coders/zorba/broken-code/+merge/172435
Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/broken-code into lp:zorba.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-05-07 08:39:33 +0000
+++ CMakeLists.txt	2013-07-01 22:54:30 +0000
@@ -16,6 +16,7 @@
 ENABLE_TESTING()
 INCLUDE(CTest)
 
+MESSAGE (STATUS "Fake change")
 
 # overwriting the source and binary directories with the current zorba ones
 # this is usefull for other projects reusing zorba as a subcomponent

=== modified file 'src/context/root_static_context.cpp'
--- src/context/root_static_context.cpp	2013-06-09 08:09:40 +0000
+++ src/context/root_static_context.cpp	2013-07-01 22:54:30 +0000
@@ -120,6 +120,7 @@
   static_context()
 {
   theTypeManager = &GENV_TYPESYSTEM;
+  this won't compile
 }