← Back to team overview

zorba-coders team mailing list archive

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

 

Ghislain Fourny has proposed merging lp:~zorba-coders/zorba/clang-friend into lp:zorba.

Requested reviews:
  David Graf (davidagraf)
  Till Westmann (tillw)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/clang-friend/+merge/100978

Added __llvm__ test because Apple LLVM compiler also does not recognize the + operator as a friend of zorba::rstring.
-- 
https://code.launchpad.net/~zorba-coders/zorba/clang-friend/+merge/100978
Your team Zorba Coders is subscribed to branch lp:zorba.
=== 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-05 14:31:22 +0000
@@ -2051,7 +2051,7 @@
 
   string_data data_;
 
-#if defined _MSC_VER || defined CLANG
+#if defined _MSC_VER || defined CLANG || __llvm__
 //
 // Microsoft's Visual Studio C++ compiler doesn't consider the operator+()
 // functions as friends even though they're declared as such.


Follow ups