Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1030861 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1030861/+merge/117534 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1032166 into lp:zorba
Ghislain Fourny has proposed merging lp:~zorba-coders/zorba/bug-1032166 into lp:zorba. Requested reviews: Matthias Brantner (matthias-brantner) Chris Hillery (ceejatec) Related bugs: Bug #1032166 in Zorba: JSONiq items RCs are decremented twice upon removeReference() call if counter 1 https://bugs.launchpad.net/zorba/+bug/1032166 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 Fixes bug 1032166 (critical memory bug). -- https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'src/store/naive/item.cpp' --- src/store/naive/item.cpp 2012-07-24 08:48:48 + +++ src/store/naive/item.cpp 2012-08-02 12:45:24 + @@ -161,6 +161,7 @@ } SYNC_CODE(static_castconst simplestore::json::JSONItem*(this)-getRCLock()-release()); +return; } #endif case ATOMIC: -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1032166 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1032166 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1032166 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-1032166 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job bug-1032166-2012-08-02T12-46-58.557Z is finished. The final status was: 6 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1032166 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1032166 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1032166 into lp:zorba
Validation queue job bug-1032166-2012-08-02T13-22-59.201Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1032166 into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1032166 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1032166 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1032166 into lp:zorba
I think it is not that critical - since the bug also was in addReference(), it only causes decrements and increments 2 by 2. It can probably wait the 2.7 release. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1030861 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1030861 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1030861/+merge/117534 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1030861/+merge/117534 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1030861 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1030861-2012-08-02T13-55-59.204Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1030861/+merge/117534 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1030861 into lp:zorba
Validation queue job bug-1030861-2012-08-02T13-55-59.204Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1030861/+merge/117534 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1030861 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1030861 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1030861/+merge/117534 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1030861/+merge/117534 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~davidagraf/zorba/bug-1025566 into lp:zorba
David Graf has proposed merging lp:~davidagraf/zorba/bug-1025566 into lp:zorba.
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~davidagraf/zorba/bug-1025566/+merge/117914
tmp fix for testdriver_mt to make it work with boost 1.50. I lost the patience
:-).
--
https://code.launchpad.net/~davidagraf/zorba/bug-1025566/+merge/117914
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'test/rbkt/testdriver_mt.cpp'
--- test/rbkt/testdriver_mt.cpp 2012-07-24 08:48:48 +
+++ test/rbkt/testdriver_mt.cpp 2012-08-02 14:46:26 +
@@ -44,8 +44,6 @@
#include testdriver_comparator.h
#include testdriver_common.h
-#define BOOST_FILESYSTEM_VERSION 2
-
// These are included last because they define the stdint.h's INTMAX_C and UINTMAX_C
#include boost/filesystem/operations.hpp
#include boost/filesystem/path.hpp
@@ -233,25 +231,45 @@
/
void createPath(const fs::path filePath, std::ofstream fileStream)
{
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
fileStream.open(filePath.file_string().c_str());
+#else
+ fileStream.open(filePath.generic_string().c_str());
+#endif
if (!fileStream.good())
{
fs::path dirPath = filePath;
dirPath = dirPath.remove_leaf();
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
if (!fs::exists(dirPath.file_string()))
+#else
+if (!fs::exists(dirPath.generic_string()))
+#endif
{
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
fs::create_directories(dirPath.file_string());
+#else
+ fs::create_directories(dirPath.generic_string());
+#endif
// clear the bad flag on windows, which for some unknown reason doesn't reset when opening a file again
fileStream.clear();
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
fileStream.open(filePath.file_string().c_str());
+#else
+ fileStream.open(filePath.generic_string().c_str());
+#endif
}
if (!fileStream.good())
{
std::cerr Could not open file:
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
filePath.file_string() std::endl;
+#else
+ filePath.generic_string() std::endl;
+#endif
abort();
}
}
@@ -380,7 +398,11 @@
relativeQueryFile = queries-theQueryFilenames[queryNo];
queryPath = fs::path(queries-theQueriesDir) / (relativeQueryFile);
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
std::string testName = fs::change_extension(queryPath, ).file_string();
+#else
+std::string testName = fs::change_extension(queryPath, ).generic_string();
+#endif
ulong pos = testName.find(Queries);
testName = testName.substr(pos + 8);
@@ -393,7 +415,11 @@
// exprected errors, or the pathnames of reference-result files.
specPath = fs::change_extension(queryPath, .spec);
if (fs::exists(specPath))
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
querySpec.parseFile(specPath.file_string(), rbkt_src_dir, rbkt_bin_dir);
+#else
+ querySpec.parseFile(specPath.generic_string(), rbkt_src_dir, rbkt_bin_dir);
+#endif
// Get the pathnames of the ref-result files found in the .spec file (if any).
// If no ref-results file was specified in the .spec file, create a default
@@ -494,14 +520,22 @@
setModulePaths(module_path, sctx);
// Set the error file to be used by the error handler for the current query
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
errHandler.setErrorFile(errorFilePath.file_string());
+#else
+errHandler.setErrorFile(errorFilePath.generic_string());
+#endif
//
// Compile the query, if it has not been compiled already.
//
if (queries-theQueryObjects[queryNo] == 0)
{
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
slurp_file(queryPath.file_string().c_str(),
+#else
+ slurp_file(queryPath.generic_string().c_str(),
+#endif
queryString,
rbkt_src_dir,
rbkt_bin_dir);
@@ -509,7 +543,11 @@
try
{
query = zorba-createQuery(errHandler);
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
query-setFileName(queryPath.file_string());
+#else
+query-setFileName(queryPath.generic_string());
+#endif
query-compile(queryString.c_str(), sctx, getCompilerHints());
}
catch(...)
@@ -632,8 +670,13 @@
ulong i;
for (i = 0; i refFilePaths.size(); i++)
{
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
std::string refFilePath = refFilePaths[i].file_string();
std::string resFilePath = resultFilePath.file_string();
+#else
+std::string
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-api-createDateTime into lp:zorba
Matthias Brantner has proposed merging
lp:~zorba-coders/zorba/feature-api-createDateTime into lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-api-createDateTime/+merge/117976
new ItemFactory function that allows creating dateTime items without timezone
The function will be needed in the archive module (see separate merge proposal).
--
https://code.launchpad.net/~zorba-coders/zorba/feature-api-createDateTime/+merge/117976
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-07-27 02:49:06 +
+++ ChangeLog 2012-08-02 19:39:20 +
@@ -13,6 +13,7 @@
* Added ft:tokenize-nodes() function to full-text module
* New XQuery 3.0 functions
- fn:parse-xml-fragment#1
+ * New ItemFactory function that allows creating dateTime items without timezone
* Added support for transient maps to the
http://www.zorba-xquery.com/modules/store/data-structures/unordered-map module.
* Added support for fragments to fn:path
=== modified file 'include/zorba/item_factory.h'
--- include/zorba/item_factory.h 2012-07-24 08:48:48 +
+++ include/zorba/item_factory.h 2012-08-02 19:39:20 +
@@ -295,6 +295,21 @@
short aHour, short aMinute, double aSecond,
short aTimeZone_hours) = 0;
+ /** \brief Creates a DateTime Item without setting a time zone.
+ * see [http://www.w3.org/TR/xmlschema-2/#dateTime]
+ *
+ * @param aYear short-valued representation of the year.
+ * @param aMonth short-valued representation of the month.
+ * @param aDay short-valued representation of the day.
+ * @param aHour short-valued representation of the hour.
+ * @param aMinute short-valued representation of the minute.
+ * @param aSecond double-valued representation of the seconds and fractional seconds.
+ * @return The DateTime Item.
+ */
+ virtual Item
+ createDateTime(short aYear, short aMonth, short aDay,
+ short aHour, short aMinute, double aSecond) = 0;
+
/** \brief Creates a DateTime Item
* see [http://www.w3.org/TR/xmlschema-2/#dateTime]
*
=== modified file 'src/api/itemfactoryimpl.cpp'
--- src/api/itemfactoryimpl.cpp 2012-07-24 08:48:48 +
+++ src/api/itemfactoryimpl.cpp 2012-08-02 19:39:20 +
@@ -366,6 +366,20 @@
}
+Item
+ItemFactoryImpl::createDateTime(
+short aYear, short aMonth, short aDay,
+short aHour, short aMinute, double aSecond)
+{
+ store::Item_t lItem;
+ theItemFactory-createDateTime(
+ lItem, aYear, aMonth, aDay,
+ aHour, aMinute, aSecond);
+
+ return *lItem;
+}
+
+
Item ItemFactoryImpl::createDateTime( const String aDateTimeValue )
{
zstring lString = Unmarshaller::getInternalString( aDateTimeValue );
=== modified file 'src/api/itemfactoryimpl.h'
--- src/api/itemfactoryimpl.h 2012-07-24 08:48:48 +
+++ src/api/itemfactoryimpl.h 2012-08-02 19:39:20 +
@@ -118,6 +118,10 @@
short aTimezone_hours);
virtual Item
+ createDateTime(short aYear, short aMonth, short aDay,
+ short aHour, short aMinute, double aSecond);
+
+ virtual Item
createDateTime( const String aDateTimeValue );
virtual Item
--
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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-api-createDateTime into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-api-createDateTime into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-api-createDateTime/+merge/117976 -- https://code.launchpad.net/~zorba-coders/zorba/feature-api-createDateTime/+merge/117976 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-api-createDateTime into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-api-createDateTime-2012-08-02T19-41-02.373Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/feature-api-createDateTime/+merge/117976 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1032166 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1032166 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1032166 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-api-createDateTime into lp:zorba
Validation queue job feature-api-createDateTime-2012-08-02T19-41-02.373Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/feature-api-createDateTime/+merge/117976 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-api-createDateTime into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/feature-api-createDateTime/+merge/117976 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-api-createDateTime into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-api-createDateTime into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-api-createDateTime/+merge/117976 -- https://code.launchpad.net/~zorba-coders/zorba/feature-api-createDateTime/+merge/117976 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1032166 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1032166-2012-08-02T20-08-58.124Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1032166 into lp:zorba
Validation queue job bug-1032166-2012-08-02T20-08-58.124Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1032166 into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1032166 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1032166 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~davidagraf/zorba/detect-clang-properly into lp:zorba
David Graf has proposed merging lp:~davidagraf/zorba/detect-clang-properly into
lp:zorba.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~davidagraf/zorba/detect-clang-properly/+merge/117994
Since OSX Mountain Lion, clang is the default c++ compiler on mac. Therefore,
it is not enough to check if the c++ compiler executable is called clang.
--
https://code.launchpad.net/~davidagraf/zorba/detect-clang-properly/+merge/117994
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'CMakeCompiler.txt'
--- CMakeCompiler.txt 2012-07-24 08:48:48 +
+++ CMakeCompiler.txt 2012-08-02 21:13:24 +
@@ -13,11 +13,18 @@
# limitations under the License.
-IF (${CMAKE_CXX_COMPILER} MATCHES clang)
- SET (CLANG 1)
-ELSE (${CMAKE_CXX_COMPILER} MATCHES clang)
- SET (CLANG 0)
-ENDIF(${CMAKE_CXX_COMPILER} MATCHES clang)
+# check if clang is used to compile c++
+EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
+ ARGS --version
+ OUTPUT_VARIABLE CXX_COMPILER_VERSION_OUTPUT
+)
+STRING(REGEX MATCH clang
+ CXX_IS_CLANG ${CXX_COMPILER_VERSION_OUTPUT})
+IF (CXX_IS_CLANG)
+ SET (CLANG 1)
+ELSE ()
+ SET (CLANG 0)
+ENDIF ()
#-
# Let's use the highest warning level.
=== modified file 'test/rbkt/testdriver_mt.cpp'
--- test/rbkt/testdriver_mt.cpp 2012-07-24 08:48:48 +
+++ test/rbkt/testdriver_mt.cpp 2012-08-02 21:13:24 +
@@ -44,8 +44,6 @@
#include testdriver_comparator.h
#include testdriver_common.h
-#define BOOST_FILESYSTEM_VERSION 2
-
// These are included last because they define the stdint.h's INTMAX_C and UINTMAX_C
#include boost/filesystem/operations.hpp
#include boost/filesystem/path.hpp
@@ -233,25 +231,45 @@
/
void createPath(const fs::path filePath, std::ofstream fileStream)
{
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
fileStream.open(filePath.file_string().c_str());
+#else
+ fileStream.open(filePath.generic_string().c_str());
+#endif
if (!fileStream.good())
{
fs::path dirPath = filePath;
dirPath = dirPath.remove_leaf();
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
if (!fs::exists(dirPath.file_string()))
+#else
+if (!fs::exists(dirPath.generic_string()))
+#endif
{
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
fs::create_directories(dirPath.file_string());
+#else
+ fs::create_directories(dirPath.generic_string());
+#endif
// clear the bad flag on windows, which for some unknown reason doesn't reset when opening a file again
fileStream.clear();
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
fileStream.open(filePath.file_string().c_str());
+#else
+ fileStream.open(filePath.generic_string().c_str());
+#endif
}
if (!fileStream.good())
{
std::cerr Could not open file:
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
filePath.file_string() std::endl;
+#else
+ filePath.generic_string() std::endl;
+#endif
abort();
}
}
@@ -380,7 +398,11 @@
relativeQueryFile = queries-theQueryFilenames[queryNo];
queryPath = fs::path(queries-theQueriesDir) / (relativeQueryFile);
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
std::string testName = fs::change_extension(queryPath, ).file_string();
+#else
+std::string testName = fs::change_extension(queryPath, ).generic_string();
+#endif
ulong pos = testName.find(Queries);
testName = testName.substr(pos + 8);
@@ -393,7 +415,11 @@
// exprected errors, or the pathnames of reference-result files.
specPath = fs::change_extension(queryPath, .spec);
if (fs::exists(specPath))
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
querySpec.parseFile(specPath.file_string(), rbkt_src_dir, rbkt_bin_dir);
+#else
+ querySpec.parseFile(specPath.generic_string(), rbkt_src_dir, rbkt_bin_dir);
+#endif
// Get the pathnames of the ref-result files found in the .spec file (if any).
// If no ref-results file was specified in the .spec file, create a default
@@ -494,14 +520,22 @@
setModulePaths(module_path, sctx);
// Set the error file to be used by the error handler for the current query
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
errHandler.setErrorFile(errorFilePath.file_string());
+#else
+errHandler.setErrorFile(errorFilePath.generic_string());
+#endif
//
// Compile the query, if it has not been compiled already.
//
if (queries-theQueryObjects[queryNo] == 0)
{
+#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
Re: [Zorba-coders] [Merge] lp:~davidagraf/zorba/cclient-with-clang into lp:zorba/email-module
adding clang parameter to ignore wrong code in the cclient -- https://code.launchpad.net/~davidagraf/zorba/cclient-with-clang/+merge/117996 Your team Zorba Coders is subscribed to branch lp:zorba/email-module. -- 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
[Zorba-coders] [Merge] lp:~davidagraf/zorba/cclient-with-clang into lp:zorba/email-module
The proposal to merge lp:~davidagraf/zorba/cclient-with-clang into lp:zorba/email-module has been updated. Commit Message changed to: Adding compiler option to make c-client headers compile with clang. For more details, see: https://code.launchpad.net/~davidagraf/zorba/cclient-with-clang/+merge/117996 -- https://code.launchpad.net/~davidagraf/zorba/cclient-with-clang/+merge/117996 Your team Zorba Coders is subscribed to branch lp:zorba/email-module. -- 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
Re: [Zorba-coders] [Merge] lp:~davidagraf/zorba/cclient-with-clang into lp:zorba/email-module
This change is dependent on https://code.launchpad.net/~davidagraf/zorba/detect-clang-properly/+merge/117994. -- https://code.launchpad.net/~davidagraf/zorba/cclient-with-clang/+merge/117996 Your team Zorba Coders is subscribed to branch lp:zorba/email-module. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-archive-dateTime into lp:zorba
Review: Needs Fixing There's a bug that arises in Windows in archive_module.cpp lines 309 to 312 from this if (theCompression != GZIP #ifndef WIN32 theCompression != BZIP2 theCompression != LZMA #endif ) to this if (theCompression != GZIP #ifndef WIN32 theCompression != BZIP2 theCompression != LZMA #endif ) -- https://code.launchpad.net/~zorba-coders/zorba/fix-archive-dateTime/+merge/117977 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-archive-dateTime into lp:zorba
There's a bug that arises in Windows in archive_module.cpp lines 309 to 312 from this if (theCompression != GZIP #ifndef WIN32 theCompression != BZIP2 theCompression != LZMA #endif ) to this if (theCompression != GZIP #ifndef WIN32 theCompression != BZIP2 theCompression != LZMA #endif ) Thanks. This should be fixed now. -- https://code.launchpad.net/~zorba-coders/zorba/fix-archive-dateTime/+merge/117977 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~davidagraf/zorba/detect-clang-properly into lp:zorba
gcc --version only output the string llvm or LLVM and not clang. You should check for LLVM and not clang. $ gcc --version i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2336.11.00) Copyright (C) 2007 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -- https://code.launchpad.net/~davidagraf/zorba/detect-clang-properly/+merge/117994 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~davidagraf/zorba/bug-1025566 into lp:zorba
Review: Approve -- https://code.launchpad.net/~davidagraf/zorba/bug-1025566/+merge/117914 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~davidagraf/zorba/bug-1025566 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1025566-2012-08-03T00-17-01.009Z/log.html -- https://code.launchpad.net/~davidagraf/zorba/bug-1025566/+merge/117914 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~davidagraf/zorba/bug-1025566 into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Approve. -- https://code.launchpad.net/~davidagraf/zorba/bug-1025566/+merge/117914 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-archive-dateTime into lp:zorba
You're merging into lp:zorba - that won't work. -- https://code.launchpad.net/~zorba-coders/zorba/fix-archive-dateTime/+merge/117977 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive-module-winfixes into lp:zorba/archive-module
I've added lp:zorba/archive-module to the list of branches the validation queue watches, so let's see if this works. -- https://code.launchpad.net/~zorba-coders/zorba/archive-module-winfixes/+merge/118010 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive-module-winfixes into lp:zorba/archive-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/archive-module-winfixes-2012-08-03T00-52-57.193Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/archive-module-winfixes/+merge/118010 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1032166 into lp:zorba
Review: Approve May as well get it in. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1032166 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1032166 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-api-createDateTime into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-api-createDateTime/+merge/117976 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-api-createDateTime into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-api-createDateTime into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-api-createDateTime/+merge/117976 -- https://code.launchpad.net/~zorba-coders/zorba/feature-api-createDateTime/+merge/117976 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive-module-winfixes into lp:zorba/archive-module
The attempt to merge lp:~zorba-coders/zorba/archive-module-winfixes into lp:zorba/archive-module failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job archive-module-winfixes-2012-08-03T00-52-57.193Z is finished. The final status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/archive-module-winfixes/+merge/118010 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive-module-winfixes into lp:zorba/archive-module
The proposal to merge lp:~zorba-coders/zorba/archive-module-winfixes into lp:zorba/archive-module has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/archive-module-winfixes/+merge/118010 -- https://code.launchpad.net/~zorba-coders/zorba/archive-module-winfixes/+merge/118010 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-api-createDateTime into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-api-createDateTime-2012-08-03T01-01-06.684Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/feature-api-createDateTime/+merge/117976 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive-module-winfixes into lp:zorba/archive-module
Ah, right, I still need to install a newer version of libarchive on the queue machine. Sorry. -- https://code.launchpad.net/~zorba-coders/zorba/archive-module-winfixes/+merge/118010 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
I tweaked this a bit to make ZORBA_WITH_THESAURUS a top-level config option. It also now defaults to ON. -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-api-createDateTime into lp:zorba
Validation queue job feature-api-createDateTime-2012-08-03T01-01-06.684Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/feature-api-createDateTime/+merge/117976 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-api-createDateTime into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-api-createDateTime into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-api-createDateTime/+merge/117976 -- https://code.launchpad.net/~zorba-coders/zorba/feature-api-createDateTime/+merge/117976 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1032166 into lp:zorba
Validation queue job bug-1032166-2012-08-03T01-26-48.12Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1032166/+merge/117883 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive-module-winfixes into lp:zorba/archive-module
The attempt to merge lp:~zorba-coders/zorba/archive-module-winfixes into lp:zorba/archive-module failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job archive-module-winfixes-2012-08-03T01-53-02.255Z is finished. The final status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/archive-module-winfixes/+merge/118010 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive-module-winfixes into lp:zorba/archive-module
The proposal to merge lp:~zorba-coders/zorba/archive-module-winfixes into lp:zorba/archive-module has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/archive-module-winfixes/+merge/118010 -- https://code.launchpad.net/~zorba-coders/zorba/archive-module-winfixes/+merge/118010 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/zorba-installer-with-thesaurus-2012-08-03T02-00-11.743Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/118031
1. s/take/swap/
2. Removed unnecessary assignment.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/118031
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/full_text/ft_module_impl.cpp'
--- src/runtime/full_text/ft_module_impl.cpp 2012-07-24 08:48:48 +
+++ src/runtime/full_text/ft_module_impl.cpp 2012-08-03 03:21:19 +
@@ -958,7 +958,7 @@
tokenizer-tokenize_string(
value_string.data(), value_string.size(), lang, false, callback
);
-state-string_tokens_.take( callback.tokens_ );
+state-string_tokens_.swap( callback.tokens_ );
} // local scope
while ( state-string_tokens_.hasNext() ) {
=== modified file 'src/runtime/full_text/ft_token_seq_iterator.cpp'
--- src/runtime/full_text/ft_token_seq_iterator.cpp 2012-07-24 08:48:48 +
+++ src/runtime/full_text/ft_token_seq_iterator.cpp 2012-08-03 03:21:19 +
@@ -25,7 +25,7 @@
namespace zorba {
FTTokenSeqIterator::FTTokenSeqIterator( FTTokens tokens ) {
- take( tokens );
+ swap( tokens );
}
FTTokenSeqIterator::~FTTokenSeqIterator() {
@@ -60,7 +60,7 @@
pos_ = 0;
}
-void FTTokenSeqIterator::take( FTTokens tokens ) {
+void FTTokenSeqIterator::swap( FTTokens tokens ) {
tokens.swap( tokens_ );
pos_ = 0;
}
=== modified file 'src/runtime/full_text/ft_token_seq_iterator.h'
--- src/runtime/full_text/ft_token_seq_iterator.h 2012-07-24 08:48:48 +
+++ src/runtime/full_text/ft_token_seq_iterator.h 2012-08-03 03:21:19 +
@@ -37,7 +37,7 @@
FTTokenSeqIterator( FTTokens );
~FTTokenSeqIterator();
- void take( FTTokens );
+ void swap( FTTokens );
// inherited
index_t begin() const;
=== modified file 'src/util/hash/hashtable.tcc'
--- src/util/hash/hashtable.tcc 2012-07-11 15:38:39 +
+++ src/util/hash/hashtable.tcc 2012-08-03 03:21:19 +
@@ -48,7 +48,6 @@
node *const p = node_alloc_.allocate( 1 );
try {
node_alloc_.construct( p, v );
-p-next_ = nullptr;
return p;
}
catch ( ... ) {
=== modified file 'src/util/string/rstring.tcc'
--- src/util/string/rstring.tcc 2012-07-24 08:48:48 +
+++ src/util/string/rstring.tcc 2012-08-03 03:21:19 +
@@ -461,7 +461,7 @@
s.rep().set_sharable();
if ( get_allocator() == s.get_allocator() ) {
-rep().swap(s.rep());
+rep().swap( s.rep() );
} else {
rstring const temp1( ibegin(), iend(), s.get_allocator() );
rstring const temp2( s.ibegin(), s.iend(), get_allocator() );
--
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
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/118031 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2012-08-03T03-37-58.302Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/118031 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2012-08-03T03-37-58.302Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/118031 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/118031 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/118031 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/zorba-installer-with-thesaurus-2012-08-03T04-10-03.417Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
Validation queue job zorba-installer-with-thesaurus-2012-08-03T04-10-03.417Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive-module-winfixes into lp:zorba/archive-module
The following code could be factorized. 174 if(lSize INT_MAX) 175 +lResult.reserve(INT_MAX); 176 + else 177 +lResult.reserve((int)lSize); -- https://code.launchpad.net/~zorba-coders/zorba/archive-module-winfixes/+merge/118010 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- 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
Re: [Zorba-coders] [Merge] lp:~davidagraf/zorba/bug-1025566 into lp:zorba
Review: Approve -- https://code.launchpad.net/~davidagraf/zorba/bug-1025566/+merge/117914 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~davidagraf/zorba/bug-1025566 into lp:zorba
The proposal to merge lp:~davidagraf/zorba/bug-1025566 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~davidagraf/zorba/bug-1025566/+merge/117914 -- https://code.launchpad.net/~davidagraf/zorba/bug-1025566/+merge/117914 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
