David Graf has proposed merging lp:~zorba-coders/zorba/clang-friend into
lp:zorba.
Requested reviews:
David Graf (davidagraf)
Paul J. Lucas (paul-lucas)
Till Westmann (tillw)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/clang-friend/+merge/101518
Added __llvm__ test because Apple LLVM compiler also does not recognize the +
operator as a friend of zorba::rstring.
Additionally, fixed two warnings shown when compiling zorba with clang.
--
https://code.launchpad.net/~zorba-coders/zorba/clang-friend/+merge/101518
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/collections/collections_impl.cpp'
--- src/runtime/collections/collections_impl.cpp 2012-04-08 21:39:25 +0000
+++ src/runtime/collections/collections_impl.cpp 2012-04-11 09:35:24 +0000
@@ -1627,7 +1627,6 @@
PlanState& planState) const
{
store::Collection_t collection;
- const StaticallyKnownCollection* collectionDecl;
store::Item_t collectionName;
store::Item_t numNodesItem;
xs_integer numNodes = 1;
@@ -1640,11 +1639,7 @@
if (!consumeNext(collectionName, theChildren[0].getp(), planState))
ZORBA_ASSERT(false);
- collectionDecl = getCollection(
- theSctx, collectionName, loc, theDynamicCollection, collection);
-
- /* added just to remove an unused variable warning in CMake */
- (void*)collectionDecl;
+ (void)getCollection(theSctx, collectionName, loc, theDynamicCollection, collection);
if (theChildren.size() > 1)
{
@@ -1751,7 +1746,6 @@
PlanState& planState) const
{
store::Collection_t collection;
- const StaticallyKnownCollection* collectionDecl;
store::Item_t collectionName;
store::Item_t numNodesItem;
xs_integer numNodes = 1;
@@ -1763,11 +1757,7 @@
consumeNext(collectionName, theChildren[0].getp(), planState);
- collectionDecl = getCollection(
- theSctx, collectionName, loc, theDynamicCollection, collection);
-
- /* added just to remove an unused variable warning in CMake */
- (void*)collectionDecl;
+ (void)getCollection(theSctx, collectionName, loc, theDynamicCollection, collection);
if (theChildren.size() > 1)
{
=== modified file 'src/util/string/rstring.h'
--- src/util/string/rstring.h 2012-03-28 05:19:57 +0000
+++ src/util/string/rstring.h 2012-04-11 09:35:24 +0000
@@ -2051,7 +2051,7 @@
string_data data_;
-#if defined _MSC_VER || defined CLANG
+#if defined _MSC_VER || defined CLANG || defined __llvm__
//
// Microsoft's Visual Studio C++ compiler doesn't consider the operator+()
// functions as friends even though they're declared as such.
--
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
