[llvm-branch-commits] [llvm-branch] r109614 - in /llvm/branches/Apple/williamson/include/llvm/Analysis: ScalarEvolution.h ScalarEvolutionExpressions.h ScalarEvolutionExpressions.h.orig

[Daniel Dunbar]

Author: ddunbar
Date: Wed Jul 28 13:40:53 2010
New Revision: 109614

URL: http://llvm.org/viewvc/llvm-project?rev=109614&view=rev
Log:
Merge r109593:
--
Author: Dan Gohman <gohman at apple.com>
Date:   Wed Jul 28 17:09:24 2010 +0000

    Add some extra friend declarations to fix a gcc-4.0 compile error.
    This is a temporary fix, until more elaborate changes are ready.

Added:
    llvm/branches/Apple/williamson/include/llvm/Analysis/ScalarEvolutionExpressions.h.orig
      - copied, changed from r109613, llvm/branches/Apple/williamson/include/llvm/Analysis/ScalarEvolutionExpressions.h
Modified:
    llvm/branches/Apple/williamson/include/llvm/Analysis/ScalarEvolution.h
    llvm/branches/Apple/williamson/include/llvm/Analysis/ScalarEvolutionExpressions.h

Modified: llvm/branches/Apple/williamson/include/llvm/Analysis/ScalarEvolution.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/williamson/include/llvm/Analysis/ScalarEvolution.h?rev=109614&r1=109613&r2=109614&view=diff
==============================================================================
--- llvm/branches/Apple/williamson/include/llvm/Analysis/ScalarEvolution.h (original)
+++ llvm/branches/Apple/williamson/include/llvm/Analysis/ScalarEvolution.h Wed Jul 28 13:40:53 2010
@@ -44,6 +44,7 @@
   class Loop;
   class LoopInfo;
   class Operator;
+  class SCEVUnknown;
 
   /// SCEV - This class represents an analyzed expression in the program.  These
   /// are opaque objects that the client is not allowed to do much with
@@ -175,6 +176,7 @@
 
     friend class SCEVCallbackVH;
     friend class SCEVExpander;
+    friend class SCEVUnknown;
 
     /// F - The function we are analyzing.
     ///

Modified: llvm/branches/Apple/williamson/include/llvm/Analysis/ScalarEvolutionExpressions.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/williamson/include/llvm/Analysis/ScalarEvolutionExpressions.h?rev=109614&r1=109613&r2=109614&view=diff
==============================================================================
--- llvm/branches/Apple/williamson/include/llvm/Analysis/ScalarEvolutionExpressions.h (original)
+++ llvm/branches/Apple/williamson/include/llvm/Analysis/ScalarEvolutionExpressions.h Wed Jul 28 13:40:53 2010
@@ -522,6 +522,7 @@
   ///
   class SCEVUnknown : public SCEV {
     friend class ScalarEvolution;
+    friend class ScalarEvolution::SCEVCallbackVH;
 
     Value *V;
     SCEVUnknown(const FoldingSetNodeIDRef ID, Value *v) :

Copied: llvm/branches/Apple/williamson/include/llvm/Analysis/ScalarEvolutionExpressions.h.orig (from r109613, llvm/branches/Apple/williamson/include/llvm/Analysis/ScalarEvolutionExpressions.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/williamson/include/llvm/Analysis/ScalarEvolutionExpressions.h.orig?p2=llvm/branches/Apple/williamson/include/llvm/Analysis/ScalarEvolutionExpressions.h.orig&p1=llvm/branches/Apple/williamson/include/llvm/Analysis/ScalarEvolutionExpressions.h&r1=109613&r2=109614&rev=109614&view=diff
==============================================================================
    (empty)