Markos Zaharioudakis has proposed merging
lp:~zorba-coders/zorba/index-maintenance into lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/index-maintenance/+merge/116413
removed some debugging code, which causes Windows compilation problems
--
https://code.launchpad.net/~zorba-coders/zorba/index-maintenance/+merge/116413
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/store/naive/atomic_items.cpp'
--- src/store/naive/atomic_items.cpp 2012-07-12 17:29:55 +0000
+++ src/store/naive/atomic_items.cpp 2012-07-24 07:44:19 +0000
@@ -257,9 +257,10 @@
std::cout << "original long value = " << item->theValue << std::endl
<< "double value = " << doubleValue << std::endl
<< "new long value = " << longValue << std::endl << std::endl;
- */
+
std::cout << "lossy = " << lossy << std::endl << std::endl;
-
+ */
+
break;
}
=== modified file 'src/store/naive/item.cpp'
--- src/store/naive/item.cpp 2012-07-16 22:19:08 +0000
+++ src/store/naive/item.cpp 2012-07-24 07:44:19 +0000
@@ -34,11 +34,14 @@
#include "runtime/function_item/function_item.h"
+<<<<<<< TREE
#include <cstdlib>
#ifndef WIN32
#include <execinfo.h>
#endif
+=======
+>>>>>>> MERGE-SOURCE
namespace zorba
{
@@ -497,6 +500,7 @@
}
+<<<<<<< TREE
#ifndef WIN32
static void print_stack_trace( std::ostream& o )
{
@@ -519,11 +523,14 @@
}
#endif
+=======
+>>>>>>> MERGE-SOURCE
/**
* Accessor for xs:untypedAtomic and xs:string and its subtypes
*/
const zstring& Item::getString() const
{
+<<<<<<< TREE
if (isAtomic())
{
std::cerr << "Atomic item value: " << getStringValue() << std::endl;
@@ -543,6 +550,8 @@
print_stack_trace(std::cerr);
#endif
+=======
+>>>>>>> MERGE-SOURCE
throw ZORBA_EXCEPTION(
zerr::ZSTR0040_TYPE_ERROR,
ERROR_PARAMS(
=== modified file 'src/store/naive/simple_pul.cpp'
--- src/store/naive/simple_pul.cpp 2012-07-19 05:11:29 +0000
+++ src/store/naive/simple_pul.cpp 2012-07-24 07:44:19 +0000
@@ -2964,7 +2964,7 @@
std::vector<store::Item_t>::iterator keyIte;
std::vector<store::Item_t>::iterator keyEnd;
- STORE_TRACE2("before-delta size = " << deletedDelta.size());
+ STORE_TRACE2("before-delta size = " << beforeDelta.size());
ite = beforeDelta.begin();
end = beforeDelta.end();
@@ -2996,7 +2996,7 @@
}
}
- STORE_TRACE2("after-delta size = " << deletedDelta.size());
+ STORE_TRACE2("after-delta size = " << afterDelta.size());
ite = afterDelta.begin();
end = afterDelta.end();
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
