Merge lp:~zorba-coders/zorba/clang-friend into lp:zorba

[David Graf]

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.

[Zorba Build Bot (zorba-buildbot)]

No approved revision specified.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/clang-friend-2012-04-05T14-39-06.813Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job clang-friend-2012-04-05T14-39-06.813Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Pending.

[Till Westmann (tillw)]

review: Approve

[David Graf (davidagraf)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/clang-friend-2012-04-10T13-49-00.571Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/clang-friend-2012-04-10T14-30-00.688Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job clang-friend-2012-04-10T14-30-00.688Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Approve, 1 Pending.

[David Graf (davidagraf)]

Added fixes to get rid of another two warnings when compiling zorba with clang.

[David Graf (davidagraf)]

review: Approve

[Till Westmann (tillw)]

The changes look ok, but I'm not sure how to test.
I tried to build this branch using clang on MacOS X, but it doesn't build for me.
What exactly should work now that did not work before?

review: Needs Information

[David Graf (davidagraf)]

> The changes look ok, but I'm not sure how to test.
> I tried to build this branch using clang on MacOS X, but it doesn't build for
> me.
> What exactly should work now that did not work before?

Hello Till

Sorry for not answering earlier. The 'defined __llvm__' condition makes Zorba compiling in XCode with clang/llvm. The other stuff fixes warnings.

[Till Westmann (tillw)]

I tried to build on the command line by replacing /usr/bin/c++ with /usr/bin/llvm-g++ (and the same for cc), but that didn't work.
To build with XCode, is it sufficient to use CMake's XCode project generator?

[David Graf (davidagraf)]

Ghislain used cmake's xcode generator, yet. But it should also work if you just replace gcc with clang. I did this on linux.

[Paul J. Lucas (paul-lucas)]

If this merge is about __llvm__, why is there apparently unrelated stuff about collectionDecl in it?

Unmerged revisions

10747. By David Graf on 2012-04-11

fixed clang warnings by removing unused variables

10746. By Ghislain Fourny on 2012-04-05

Forgot defined keyword.

10745. By Ghislain Fourny on 2012-04-05

XCode's LLVM compiler also does not recognize the + operator as a zorba::rstring friend.

=== 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.