Hi Chris,<div><br></div><div>This may be a silly question, but is there a reason why these changes were restricted to the header files? Or is it just that you haven't gotten around to making the changes in the .cpp files?</div>
<div><br></div><div>Also, I notice that there are still some forward declarations of raw_ostream in some header files, for instance "include/clang/AST/PrettyPrinter.h". Are these left as in-file forward declarations versus including "LLVM.h" because the utility of leaving the forward declaration in-file and tying out the using statement versus including "LLVM.h" isn't sufficient for being able to change one case of "llvm::raw_stream" to "raw_ostream" in the header file? Or is this - like the last question - just a case of not having gotten here yet? Or have I just completely missed the boat here? :)</div>
<div><br></div><div>In either case, I would be happy to provide patches if you think it would help clean things up.</div><div><br></div><div>Thanks,</div><div>Jon<br><br><div class="gmail_quote">On Wed, Jul 20, 2011 at 2:06 AM, Chris Lattner <span dir="ltr"><<a href="mailto:sabre@nondot.org">sabre@nondot.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">Author: lattner<br>
Date: Wed Jul 20 02:06:53 2011<br>
New Revision: 135577<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=135577&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=135577&view=rev</a><br>
Log:<br>
add raw_ostream and Twine to LLVM.h, eliminating a ton of llvm:: qualifications.<br>
<br>
Modified:<br>
cfe/trunk/include/clang/AST/APValue.h<br>
cfe/trunk/include/clang/AST/ASTContext.h<br>
cfe/trunk/include/clang/AST/Decl.h<br>
cfe/trunk/include/clang/AST/DeclBase.h<br>
cfe/trunk/include/clang/AST/DeclObjC.h<br>
cfe/trunk/include/clang/AST/DeclarationName.h<br>
cfe/trunk/include/clang/AST/Mangle.h<br>
cfe/trunk/include/clang/AST/NestedNameSpecifier.h<br>
cfe/trunk/include/clang/AST/PrettyPrinter.h<br>
cfe/trunk/include/clang/AST/Stmt.h<br>
cfe/trunk/include/clang/AST/TemplateBase.h<br>
cfe/trunk/include/clang/AST/TemplateName.h<br>
cfe/trunk/include/clang/Analysis/Analyses/FormatString.h<br>
cfe/trunk/include/clang/Analysis/CFG.h<br>
cfe/trunk/include/clang/Basic/LLVM.h<br>
cfe/trunk/include/clang/Basic/MacroBuilder.h<br>
cfe/trunk/include/clang/Basic/OnDiskHashTable.h<br>
cfe/trunk/include/clang/Basic/PrettyStackTrace.h<br>
cfe/trunk/include/clang/Basic/SourceLocation.h<br>
cfe/trunk/include/clang/Basic/VersionTuple.h<br>
cfe/trunk/include/clang/CodeGen/BackendUtil.h<br>
cfe/trunk/include/clang/Driver/ArgList.h<br>
cfe/trunk/include/clang/Driver/Compilation.h<br>
cfe/trunk/include/clang/Driver/Driver.h<br>
cfe/trunk/include/clang/Driver/OptTable.h<br>
cfe/trunk/include/clang/Frontend/ASTConsumers.h<br>
cfe/trunk/include/clang/Frontend/ASTUnit.h<br>
cfe/trunk/include/clang/Frontend/CompilerInstance.h<br>
cfe/trunk/include/clang/Frontend/FrontendActions.h<br>
cfe/trunk/include/clang/Frontend/LogDiagnosticPrinter.h<br>
cfe/trunk/include/clang/Frontend/TextDiagnosticPrinter.h<br>
cfe/trunk/include/clang/Frontend/Utils.h<br>
cfe/trunk/include/clang/Index/ASTLocation.h<br>
cfe/trunk/include/clang/Index/CallGraph.h<br>
cfe/trunk/include/clang/Parse/Parser.h<br>
cfe/trunk/include/clang/Rewrite/ASTConsumers.h<br>
cfe/trunk/include/clang/Rewrite/FixItRewriter.h<br>
cfe/trunk/include/clang/Rewrite/Rewriter.h<br>
cfe/trunk/include/clang/Rewrite/Rewriters.h<br>
cfe/trunk/include/clang/Sema/CodeCompleteConsumer.h<br>
cfe/trunk/include/clang/Sema/Initialization.h<br>
cfe/trunk/include/clang/Sema/Lookup.h<br>
cfe/trunk/include/clang/Sema/PrettyDeclStackTrace.h<br>
cfe/trunk/include/clang/Serialization/ASTWriter.h<br>
cfe/trunk/include/clang/StaticAnalyzer/Core/CheckerProvider.h<br>
cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h<br>
cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/GRState.h<br>
cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h<br>
cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h<br>
cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h<br>
cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h<br>
cfe/trunk/include/clang/StaticAnalyzer/Frontend/FrontendActions.h<br>
cfe/trunk/lib/CodeGen/CGRecordLayout.h<br>
cfe/trunk/lib/CodeGen/CodeGenFunction.h<br>
<br>
Modified: cfe/trunk/include/clang/AST/APValue.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/APValue.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/APValue.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/APValue.h (original)<br>
+++ cfe/trunk/include/clang/AST/APValue.h Wed Jul 20 02:06:53 2011<br>
@@ -14,6 +14,7 @@<br>
#ifndef LLVM_CLANG_AST_APVALUE_H<br>
#define LLVM_CLANG_AST_APVALUE_H<br>
<br>
+#include "clang/Basic/LLVM.h"<br>
#include "llvm/ADT/APSInt.h"<br>
#include "llvm/ADT/APFloat.h"<br>
<br>
@@ -104,7 +105,7 @@<br>
bool isLValue() const { return Kind == LValue; }<br>
bool isVector() const { return Kind == Vector; }<br>
<br>
- void print(llvm::raw_ostream &OS) const;<br>
+ void print(raw_ostream &OS) const;<br>
void dump() const;<br>
<br>
APSInt &getInt() {<br>
@@ -234,7 +235,7 @@<br>
void MakeLValue();<br>
};<br>
<br>
-inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, const APValue &V) {<br>
+inline raw_ostream &operator<<(raw_ostream &OS, const APValue &V) {<br>
V.print(OS);<br>
return OS;<br>
}<br>
<br>
Modified: cfe/trunk/include/clang/AST/ASTContext.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/ASTContext.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/ASTContext.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/ASTContext.h (original)<br>
+++ cfe/trunk/include/clang/AST/ASTContext.h Wed Jul 20 02:06:53 2011<br>
@@ -1145,7 +1145,7 @@<br>
const ASTRecordLayout &getASTObjCInterfaceLayout(const ObjCInterfaceDecl *D)<br>
const;<br>
<br>
- void DumpRecordLayout(const RecordDecl *RD, llvm::raw_ostream &OS) const;<br>
+ void DumpRecordLayout(const RecordDecl *RD, raw_ostream &OS) const;<br>
<br>
/// getASTObjCImplementationLayout - Get or compute information about<br>
/// the layout of the specified Objective-C implementation. This may<br>
<br>
Modified: cfe/trunk/include/clang/AST/Decl.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Decl.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Decl.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/Decl.h (original)<br>
+++ cfe/trunk/include/clang/AST/Decl.h Wed Jul 20 02:06:53 2011<br>
@@ -132,7 +132,7 @@<br>
// FIXME: Deprecated, move clients to getName().<br>
std::string getNameAsString() const { return Name.getAsString(); }<br>
<br>
- void printName(llvm::raw_ostream &os) const { return Name.printName(os); }<br>
+ void printName(raw_ostream &os) const { return Name.printName(os); }<br>
<br>
/// getDeclName - Get the actual, stored name of the declaration,<br>
/// which may be a special name.<br>
@@ -294,7 +294,7 @@<br>
static bool classofKind(Kind K) { return K >= firstNamed && K <= lastNamed; }<br>
};<br>
<br>
-inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,<br>
+inline raw_ostream &operator<<(raw_ostream &OS,<br>
const NamedDecl *ND) {<br>
ND->getDeclName().printName(OS);<br>
return OS;<br>
<br>
Modified: cfe/trunk/include/clang/AST/DeclBase.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclBase.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclBase.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/DeclBase.h (original)<br>
+++ cfe/trunk/include/clang/AST/DeclBase.h Wed Jul 20 02:06:53 2011<br>
@@ -734,15 +734,15 @@<br>
static DeclContext *castToDeclContext(const Decl *);<br>
static Decl *castFromDeclContext(const DeclContext *);<br>
<br>
- void print(llvm::raw_ostream &Out, unsigned Indentation = 0) const;<br>
- void print(llvm::raw_ostream &Out, const PrintingPolicy &Policy,<br>
+ void print(raw_ostream &Out, unsigned Indentation = 0) const;<br>
+ void print(raw_ostream &Out, const PrintingPolicy &Policy,<br>
unsigned Indentation = 0) const;<br>
static void printGroup(Decl** Begin, unsigned NumDecls,<br>
- llvm::raw_ostream &Out, const PrintingPolicy &Policy,<br>
+ raw_ostream &Out, const PrintingPolicy &Policy,<br>
unsigned Indentation = 0);<br>
void dump() const;<br>
void dumpXML() const;<br>
- void dumpXML(llvm::raw_ostream &OS) const;<br>
+ void dumpXML(raw_ostream &OS) const;<br>
<br>
private:<br>
const Attr *getAttrsImpl() const;<br>
@@ -763,7 +763,7 @@<br>
SourceManager &sm, const char *Msg)<br>
: TheDecl(theDecl), Loc(L), SM(sm), Message(Msg) {}<br>
<br>
- virtual void print(llvm::raw_ostream &OS) const;<br>
+ virtual void print(raw_ostream &OS) const;<br>
};<br>
<br>
class DeclContextLookupResult<br>
<br>
Modified: cfe/trunk/include/clang/AST/DeclObjC.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclObjC.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclObjC.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/DeclObjC.h (original)<br>
+++ cfe/trunk/include/clang/AST/DeclObjC.h Wed Jul 20 02:06:53 2011<br>
@@ -1228,7 +1228,7 @@<br>
static bool classofKind(Kind K) { return K == ObjCCategoryImpl;}<br>
};<br>
<br>
-llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,<br>
+raw_ostream &operator<<(raw_ostream &OS,<br>
const ObjCCategoryImplDecl *CID);<br>
<br>
/// ObjCImplementationDecl - Represents a class definition - this is where<br>
@@ -1368,7 +1368,7 @@<br>
friend class ASTDeclWriter;<br>
};<br>
<br>
-llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,<br>
+raw_ostream &operator<<(raw_ostream &OS,<br>
const ObjCImplementationDecl *ID);<br>
<br>
/// ObjCCompatibleAliasDecl - Represents alias of a class. This alias is<br>
<br>
Modified: cfe/trunk/include/clang/AST/DeclarationName.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclarationName.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclarationName.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/DeclarationName.h (original)<br>
+++ cfe/trunk/include/clang/AST/DeclarationName.h Wed Jul 20 02:06:53 2011<br>
@@ -203,7 +203,7 @@<br>
std::string getAsString() const;<br>
<br>
/// printName - Print the human-readable name to a stream.<br>
- void printName(llvm::raw_ostream &OS) const;<br>
+ void printName(raw_ostream &OS) const;<br>
<br>
/// getAsIdentifierInfo - Retrieve the IdentifierInfo * stored in<br>
/// this declaration name, or NULL if this declaration name isn't a<br>
@@ -503,7 +503,7 @@<br>
std::string getAsString() const;<br>
<br>
/// printName - Print the human-readable name to a stream.<br>
- void printName(llvm::raw_ostream &OS) const;<br>
+ void printName(raw_ostream &OS) const;<br>
<br>
/// getBeginLoc - Retrieve the location of the first token.<br>
SourceLocation getBeginLoc() const { return NameLoc; }<br>
@@ -533,7 +533,7 @@<br>
return PD;<br>
}<br>
<br>
-inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,<br>
+inline raw_ostream &operator<<(raw_ostream &OS,<br>
DeclarationNameInfo DNInfo) {<br>
DNInfo.printName(OS);<br>
return OS;<br>
<br>
Modified: cfe/trunk/include/clang/AST/Mangle.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Mangle.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Mangle.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/Mangle.h (original)<br>
+++ cfe/trunk/include/clang/AST/Mangle.h Wed Jul 20 02:06:53 2011<br>
@@ -95,46 +95,46 @@<br>
/// @{<br>
<br>
virtual bool shouldMangleDeclName(const NamedDecl *D) = 0;<br>
- virtual void mangleName(const NamedDecl *D, llvm::raw_ostream &)=0;<br>
+ virtual void mangleName(const NamedDecl *D, raw_ostream &)=0;<br>
virtual void mangleThunk(const CXXMethodDecl *MD,<br>
const ThunkInfo &Thunk,<br>
- llvm::raw_ostream &) = 0;<br>
+ raw_ostream &) = 0;<br>
virtual void mangleCXXDtorThunk(const CXXDestructorDecl *DD, CXXDtorType Type,<br>
const ThisAdjustment &ThisAdjustment,<br>
- llvm::raw_ostream &) = 0;<br>
+ raw_ostream &) = 0;<br>
virtual void mangleReferenceTemporary(const VarDecl *D,<br>
- llvm::raw_ostream &) = 0;<br>
+ raw_ostream &) = 0;<br>
virtual void mangleCXXVTable(const CXXRecordDecl *RD,<br>
- llvm::raw_ostream &) = 0;<br>
+ raw_ostream &) = 0;<br>
virtual void mangleCXXVTT(const CXXRecordDecl *RD,<br>
- llvm::raw_ostream &) = 0;<br>
+ raw_ostream &) = 0;<br>
virtual void mangleCXXCtorVTable(const CXXRecordDecl *RD, int64_t Offset,<br>
const CXXRecordDecl *Type,<br>
- llvm::raw_ostream &) = 0;<br>
- virtual void mangleCXXRTTI(QualType T, llvm::raw_ostream &) = 0;<br>
- virtual void mangleCXXRTTIName(QualType T, llvm::raw_ostream &) = 0;<br>
+ raw_ostream &) = 0;<br>
+ virtual void mangleCXXRTTI(QualType T, raw_ostream &) = 0;<br>
+ virtual void mangleCXXRTTIName(QualType T, raw_ostream &) = 0;<br>
virtual void mangleCXXCtor(const CXXConstructorDecl *D, CXXCtorType Type,<br>
- llvm::raw_ostream &) = 0;<br>
+ raw_ostream &) = 0;<br>
virtual void mangleCXXDtor(const CXXDestructorDecl *D, CXXDtorType Type,<br>
- llvm::raw_ostream &) = 0;<br>
+ raw_ostream &) = 0;<br>
<br>
void mangleGlobalBlock(const BlockDecl *BD,<br>
- llvm::raw_ostream &Out);<br>
+ raw_ostream &Out);<br>
void mangleCtorBlock(const CXXConstructorDecl *CD, CXXCtorType CT,<br>
- const BlockDecl *BD, llvm::raw_ostream &Out);<br>
+ const BlockDecl *BD, raw_ostream &Out);<br>
void mangleDtorBlock(const CXXDestructorDecl *CD, CXXDtorType DT,<br>
- const BlockDecl *BD, llvm::raw_ostream &Out);<br>
+ const BlockDecl *BD, raw_ostream &Out);<br>
void mangleBlock(const DeclContext *DC, const BlockDecl *BD,<br>
- llvm::raw_ostream &Out);<br>
+ raw_ostream &Out);<br>
// Do the right thing.<br>
- void mangleBlock(const BlockDecl *BD, llvm::raw_ostream &Out);<br>
+ void mangleBlock(const BlockDecl *BD, raw_ostream &Out);<br>
<br>
void mangleObjCMethodName(const ObjCMethodDecl *MD,<br>
- llvm::raw_ostream &);<br>
+ raw_ostream &);<br>
<br>
// This is pretty lame.<br>
virtual void mangleItaniumGuardVariable(const VarDecl *D,<br>
- llvm::raw_ostream &) {<br>
+ raw_ostream &) {<br>
assert(0 && "Target does not support mangling guard variables");<br>
}<br>
/// @}<br>
<br>
Modified: cfe/trunk/include/clang/AST/NestedNameSpecifier.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/NestedNameSpecifier.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/NestedNameSpecifier.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/NestedNameSpecifier.h (original)<br>
+++ cfe/trunk/include/clang/AST/NestedNameSpecifier.h Wed Jul 20 02:06:53 2011<br>
@@ -196,7 +196,7 @@<br>
<br>
/// \brief Print this nested name specifier to the given output<br>
/// stream.<br>
- void print(llvm::raw_ostream &OS, const PrintingPolicy &Policy) const;<br>
+ void print(raw_ostream &OS, const PrintingPolicy &Policy) const;<br>
<br>
void Profile(llvm::FoldingSetNodeID &ID) const {<br>
ID.AddPointer(Prefix.getOpaqueValue());<br>
<br>
Modified: cfe/trunk/include/clang/AST/PrettyPrinter.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/PrettyPrinter.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/PrettyPrinter.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/PrettyPrinter.h (original)<br>
+++ cfe/trunk/include/clang/AST/PrettyPrinter.h Wed Jul 20 02:06:53 2011<br>
@@ -29,7 +29,7 @@<br>
class PrinterHelper {<br>
public:<br>
virtual ~PrinterHelper();<br>
- virtual bool handledStmt(Stmt* E, llvm::raw_ostream& OS) = 0;<br>
+ virtual bool handledStmt(Stmt* E, raw_ostream& OS) = 0;<br>
};<br>
<br>
/// \brief Describes how types, statements, expressions, and<br>
<br>
Modified: cfe/trunk/include/clang/AST/Stmt.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Stmt.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Stmt.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/Stmt.h (original)<br>
+++ cfe/trunk/include/clang/AST/Stmt.h Wed Jul 20 02:06:53 2011<br>
@@ -269,7 +269,7 @@<br>
/// This is useful in a debugger.<br>
void dump() const;<br>
void dump(SourceManager &SM) const;<br>
- void dump(llvm::raw_ostream &OS, SourceManager &SM) const;<br>
+ void dump(raw_ostream &OS, SourceManager &SM) const;<br>
<br>
/// dumpAll - This does a dump of the specified AST fragment and all subtrees.<br>
void dumpAll() const;<br>
@@ -278,12 +278,12 @@<br>
/// dumpPretty/printPretty - These two methods do a "pretty print" of the AST<br>
/// back to its original source language syntax.<br>
void dumpPretty(ASTContext& Context) const;<br>
- void printPretty(llvm::raw_ostream &OS, PrinterHelper *Helper,<br>
+ void printPretty(raw_ostream &OS, PrinterHelper *Helper,<br>
const PrintingPolicy &Policy,<br>
unsigned Indentation = 0) const {<br>
printPretty(OS, *(ASTContext*)0, Helper, Policy, Indentation);<br>
}<br>
- void printPretty(llvm::raw_ostream &OS, ASTContext &Context,<br>
+ void printPretty(raw_ostream &OS, ASTContext &Context,<br>
PrinterHelper *Helper,<br>
const PrintingPolicy &Policy,<br>
unsigned Indentation = 0) const;<br>
<br>
Modified: cfe/trunk/include/clang/AST/TemplateBase.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/TemplateBase.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/TemplateBase.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/TemplateBase.h (original)<br>
+++ cfe/trunk/include/clang/AST/TemplateBase.h Wed Jul 20 02:06:53 2011<br>
@@ -354,7 +354,7 @@<br>
TemplateArgument getPackExpansionPattern() const;<br>
<br>
/// \brief Print this template argument to the given output stream.<br>
- void print(const PrintingPolicy &Policy, llvm::raw_ostream &Out) const;<br>
+ void print(const PrintingPolicy &Policy, raw_ostream &Out) const;<br>
<br>
/// \brief Used to insert TemplateArguments into FoldingSets.<br>
void Profile(llvm::FoldingSetNodeID &ID, const ASTContext &Context) const;<br>
<br>
Modified: cfe/trunk/include/clang/AST/TemplateName.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/TemplateName.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/TemplateName.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/TemplateName.h (original)<br>
+++ cfe/trunk/include/clang/AST/TemplateName.h Wed Jul 20 02:06:53 2011<br>
@@ -14,14 +14,11 @@<br>
#ifndef LLVM_CLANG_AST_TEMPLATENAME_H<br>
#define LLVM_CLANG_AST_TEMPLATENAME_H<br>
<br>
+#include "clang/Basic/LLVM.h"<br>
#include "llvm/ADT/FoldingSet.h"<br>
#include "llvm/ADT/PointerUnion.h"<br>
#include "clang/Basic/OperatorKinds.h"<br>
<br>
-namespace llvm {<br>
- class raw_ostream;<br>
-}<br>
-<br>
namespace clang {<br>
<br>
class ASTContext;<br>
@@ -308,7 +305,7 @@<br>
/// \param SuppressNNS if true, don't print the<br>
/// nested-name-specifier that precedes the template name (if it has<br>
/// one).<br>
- void print(llvm::raw_ostream &OS, const PrintingPolicy &Policy,<br>
+ void print(raw_ostream &OS, const PrintingPolicy &Policy,<br>
bool SuppressNNS = false) const;<br>
<br>
/// \brief Debugging aid that dumps the template name to standard<br>
<br>
Modified: cfe/trunk/include/clang/Analysis/Analyses/FormatString.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/Analyses/FormatString.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/Analyses/FormatString.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Analysis/Analyses/FormatString.h (original)<br>
+++ cfe/trunk/include/clang/Analysis/Analyses/FormatString.h Wed Jul 20 02:06:53 2011<br>
@@ -271,7 +271,7 @@<br>
<br>
ArgTypeResult getArgType(ASTContext &Ctx) const;<br>
<br>
- void toString(llvm::raw_ostream &os) const;<br>
+ void toString(raw_ostream &os) const;<br>
<br>
bool usesPositionalArg() const { return (bool) UsesPositionalArg; }<br>
unsigned getPositionalArgIndex() const {<br>
@@ -465,7 +465,7 @@<br>
/// was not successful.<br>
bool fixType(QualType QT);<br>
<br>
- void toString(llvm::raw_ostream &os) const;<br>
+ void toString(raw_ostream &os) const;<br>
<br>
// Validation methods - to check if any element results in undefined behavior<br>
bool hasValidPlusPrefix() const;<br>
<br>
Modified: cfe/trunk/include/clang/Analysis/CFG.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/CFG.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/CFG.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Analysis/CFG.h (original)<br>
+++ cfe/trunk/include/clang/Analysis/CFG.h Wed Jul 20 02:06:53 2011<br>
@@ -478,8 +478,8 @@<br>
unsigned getBlockID() const { return BlockID; }<br>
<br>
void dump(const CFG *cfg, const LangOptions &LO) const;<br>
- void print(llvm::raw_ostream &OS, const CFG* cfg, const LangOptions &LO) const;<br>
- void printTerminator(llvm::raw_ostream &OS, const LangOptions &LO) const;<br>
+ void print(raw_ostream &OS, const CFG* cfg, const LangOptions &LO) const;<br>
+ void printTerminator(raw_ostream &OS, const LangOptions &LO) const;<br>
<br>
void addSuccessor(CFGBlock* Block, BumpVectorContext &C) {<br>
if (Block)<br>
@@ -652,7 +652,7 @@<br>
//===--------------------------------------------------------------------===//<br>
<br>
void viewCFG(const LangOptions &LO) const;<br>
- void print(llvm::raw_ostream& OS, const LangOptions &LO) const;<br>
+ void print(raw_ostream& OS, const LangOptions &LO) const;<br>
void dump(const LangOptions &LO) const;<br>
<br>
//===--------------------------------------------------------------------===//<br>
<br>
Modified: cfe/trunk/include/clang/Basic/LLVM.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/LLVM.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/LLVM.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/LLVM.h (original)<br>
+++ cfe/trunk/include/clang/Basic/LLVM.h Wed Jul 20 02:06:53 2011<br>
@@ -22,10 +22,12 @@<br>
namespace llvm {<br>
// ADT's.<br>
class StringRef;<br>
+ class Twine;<br>
template<typename T, unsigned N> class SmallVector;<br>
template<typename T> class SmallVectorImpl;<br>
-<br>
- // TODO: Twine, raw_ostream, DenseMap, ...<br>
+<br>
+ class raw_ostream;<br>
+ // TODO: DenseMap, ...<br>
}<br>
<br>
<br>
@@ -37,10 +39,13 @@<br>
using llvm::dyn_cast_or_null;<br>
using llvm::cast_or_null;<br>
<br>
+ // ADT's.<br>
using llvm::StringRef;<br>
+ using llvm::Twine;<br>
using llvm::SmallVector;<br>
using llvm::SmallVectorImpl;<br>
<br>
+ using llvm::raw_ostream;<br>
} // end namespace clang.<br>
<br>
#endif<br>
<br>
Modified: cfe/trunk/include/clang/Basic/MacroBuilder.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/MacroBuilder.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/MacroBuilder.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/MacroBuilder.h (original)<br>
+++ cfe/trunk/include/clang/Basic/MacroBuilder.h Wed Jul 20 02:06:53 2011<br>
@@ -20,23 +20,23 @@<br>
namespace clang {<br>
<br>
class MacroBuilder {<br>
- llvm::raw_ostream &Out;<br>
+ raw_ostream &Out;<br>
public:<br>
- MacroBuilder(llvm::raw_ostream &Output) : Out(Output) {}<br>
+ MacroBuilder(raw_ostream &Output) : Out(Output) {}<br>
<br>
/// Append a #define line for macro of the form "#define Name Value\n".<br>
- void defineMacro(const llvm::Twine &Name, const llvm::Twine &Value = "1") {<br>
+ void defineMacro(const Twine &Name, const Twine &Value = "1") {<br>
Out << "#define " << Name << ' ' << Value << '\n';<br>
}<br>
<br>
/// Append a #undef line for Name. Name should be of the form XXX<br>
/// and we emit "#undef XXX".<br>
- void undefineMacro(const llvm::Twine &Name) {<br>
+ void undefineMacro(const Twine &Name) {<br>
Out << "#undef " << Name << '\n';<br>
}<br>
<br>
/// Directly append Str and a newline to the underlying buffer.<br>
- void append(const llvm::Twine &Str) {<br>
+ void append(const Twine &Str) {<br>
Out << Str << '\n';<br>
}<br>
};<br>
<br>
Modified: cfe/trunk/include/clang/Basic/OnDiskHashTable.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/OnDiskHashTable.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/OnDiskHashTable.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/OnDiskHashTable.h (original)<br>
+++ cfe/trunk/include/clang/Basic/OnDiskHashTable.h Wed Jul 20 02:06:53 2011<br>
@@ -28,31 +28,31 @@<br>
<br>
typedef uint32_t Offset;<br>
<br>
-inline void Emit8(llvm::raw_ostream& Out, uint32_t V) {<br>
+inline void Emit8(raw_ostream& Out, uint32_t V) {<br>
Out << (unsigned char)(V);<br>
}<br>
<br>
-inline void Emit16(llvm::raw_ostream& Out, uint32_t V) {<br>
+inline void Emit16(raw_ostream& Out, uint32_t V) {<br>
Out << (unsigned char)(V);<br>
Out << (unsigned char)(V >> 8);<br>
assert((V >> 16) == 0);<br>
}<br>
<br>
-inline void Emit24(llvm::raw_ostream& Out, uint32_t V) {<br>
+inline void Emit24(raw_ostream& Out, uint32_t V) {<br>
Out << (unsigned char)(V);<br>
Out << (unsigned char)(V >> 8);<br>
Out << (unsigned char)(V >> 16);<br>
assert((V >> 24) == 0);<br>
}<br>
<br>
-inline void Emit32(llvm::raw_ostream& Out, uint32_t V) {<br>
+inline void Emit32(raw_ostream& Out, uint32_t V) {<br>
Out << (unsigned char)(V);<br>
Out << (unsigned char)(V >> 8);<br>
Out << (unsigned char)(V >> 16);<br>
Out << (unsigned char)(V >> 24);<br>
}<br>
<br>
-inline void Emit64(llvm::raw_ostream& Out, uint64_t V) {<br>
+inline void Emit64(raw_ostream& Out, uint64_t V) {<br>
Out << (unsigned char)(V);<br>
Out << (unsigned char)(V >> 8);<br>
Out << (unsigned char)(V >> 16);<br>
@@ -63,7 +63,7 @@<br>
Out << (unsigned char)(V >> 56);<br>
}<br>
<br>
-inline void Pad(llvm::raw_ostream& Out, unsigned A) {<br>
+inline void Pad(raw_ostream& Out, unsigned A) {<br>
Offset off = (Offset) Out.tell();<br>
uint32_t n = ((uintptr_t)(off+A-1) & ~(uintptr_t)(A-1)) - off;<br>
for (; n ; --n)<br>
@@ -182,12 +182,12 @@<br>
InfoObj));<br>
}<br>
<br>
- io::Offset Emit(llvm::raw_ostream &out) {<br>
+ io::Offset Emit(raw_ostream &out) {<br>
Info InfoObj;<br>
return Emit(out, InfoObj);<br>
}<br>
<br>
- io::Offset Emit(llvm::raw_ostream &out, Info &InfoObj) {<br>
+ io::Offset Emit(raw_ostream &out, Info &InfoObj) {<br>
using namespace clang::io;<br>
<br>
// Emit the payload of the table.<br>
<br>
Modified: cfe/trunk/include/clang/Basic/PrettyStackTrace.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/PrettyStackTrace.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/PrettyStackTrace.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/PrettyStackTrace.h (original)<br>
+++ cfe/trunk/include/clang/Basic/PrettyStackTrace.h Wed Jul 20 02:06:53 2011<br>
@@ -30,7 +30,7 @@<br>
public:<br>
PrettyStackTraceLoc(SourceManager &sm, SourceLocation L, const char *Msg)<br>
: SM(sm), Loc(L), Message(Msg) {}<br>
- virtual void print(llvm::raw_ostream &OS) const;<br>
+ virtual void print(raw_ostream &OS) const;<br>
};<br>
}<br>
<br>
<br>
Modified: cfe/trunk/include/clang/Basic/SourceLocation.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/SourceLocation.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/SourceLocation.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/SourceLocation.h (original)<br>
+++ cfe/trunk/include/clang/Basic/SourceLocation.h Wed Jul 20 02:06:53 2011<br>
@@ -164,7 +164,7 @@<br>
return getFromRawEncoding((unsigned)(uintptr_t)Encoding);<br>
}<br>
<br>
- void print(llvm::raw_ostream &OS, const SourceManager &SM) const;<br>
+ void print(raw_ostream &OS, const SourceManager &SM) const;<br>
void dump(const SourceManager &SM) const;<br>
};<br>
<br>
<br>
Modified: cfe/trunk/include/clang/Basic/VersionTuple.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/VersionTuple.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/VersionTuple.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/VersionTuple.h (original)<br>
+++ cfe/trunk/include/clang/Basic/VersionTuple.h Wed Jul 20 02:06:53 2011<br>
@@ -14,13 +14,10 @@<br>
#ifndef LLVM_CLANG_BASIC_VERSIONTUPLE_H<br>
#define LLVM_CLANG_BASIC_VERSIONTUPLE_H<br>
<br>
+#include "clang/Basic/LLVM.h"<br>
#include "llvm/ADT/Optional.h"<br>
#include <string><br>
<br>
-namespace llvm {<br>
- class raw_ostream;<br>
-}<br>
-<br>
namespace clang {<br>
<br>
/// \brief Represents a version number in the form major[.minor[.subminor]].<br>
@@ -120,7 +117,7 @@<br>
};<br>
<br>
/// \brief Print a version number.<br>
-llvm::raw_ostream& operator<<(llvm::raw_ostream &Out, const VersionTuple &V);<br>
+raw_ostream& operator<<(raw_ostream &Out, const VersionTuple &V);<br>
<br>
} // end namespace clang<br>
#endif // LLVM_CLANG_BASIC_VERSIONTUPLE_H<br>
<br>
Modified: cfe/trunk/include/clang/CodeGen/BackendUtil.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/CodeGen/BackendUtil.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/CodeGen/BackendUtil.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/CodeGen/BackendUtil.h (original)<br>
+++ cfe/trunk/include/clang/CodeGen/BackendUtil.h Wed Jul 20 02:06:53 2011<br>
@@ -10,9 +10,10 @@<br>
#ifndef LLVM_CLANG_CODEGEN_BACKEND_UTIL_H<br>
#define LLVM_CLANG_CODEGEN_BACKEND_UTIL_H<br>
<br>
+#include "clang/Basic/LLVM.h"<br>
+<br>
namespace llvm {<br>
class Module;<br>
- class raw_ostream;<br>
}<br>
<br>
namespace clang {<br>
@@ -33,7 +34,7 @@<br>
void EmitBackendOutput(Diagnostic &Diags, const CodeGenOptions &CGOpts,<br>
const TargetOptions &TOpts, const LangOptions &LOpts,<br>
llvm::Module *M,<br>
- BackendAction Action, llvm::raw_ostream *OS);<br>
+ BackendAction Action, raw_ostream *OS);<br>
}<br>
<br>
#endif<br>
<br>
Modified: cfe/trunk/include/clang/Driver/ArgList.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/ArgList.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/ArgList.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Driver/ArgList.h (original)<br>
+++ cfe/trunk/include/clang/Driver/ArgList.h Wed Jul 20 02:06:53 2011<br>
@@ -259,7 +259,7 @@<br>
const char *MakeArgString(std::string Str) const {<br>
return MakeArgString(StringRef(Str));<br>
}<br>
- const char *MakeArgString(const llvm::Twine &Str) const;<br>
+ const char *MakeArgString(const Twine &Str) const;<br>
<br>
/// \brief Create an arg string for (\arg LHS + \arg RHS), reusing the<br>
/// string at \arg Index if possible.<br>
<br>
Modified: cfe/trunk/include/clang/Driver/Compilation.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Compilation.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Compilation.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Driver/Compilation.h (original)<br>
+++ cfe/trunk/include/clang/Driver/Compilation.h Wed Jul 20 02:06:53 2011<br>
@@ -120,7 +120,7 @@<br>
/// \param J - The job to print.<br>
/// \param Terminator - A string to print at the end of the line.<br>
/// \param Quote - Should separate arguments be quoted.<br>
- void PrintJob(llvm::raw_ostream &OS, const Job &J,<br>
+ void PrintJob(raw_ostream &OS, const Job &J,<br>
const char *Terminator, bool Quote) const;<br>
<br>
/// ExecuteCommand - Execute an actual command.<br>
<br>
Modified: cfe/trunk/include/clang/Driver/Driver.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Driver.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Driver.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Driver/Driver.h (original)<br>
+++ cfe/trunk/include/clang/Driver/Driver.h Wed Jul 20 02:06:53 2011<br>
@@ -281,7 +281,7 @@<br>
void PrintOptions(const ArgList &Args) const;<br>
<br>
/// PrintVersion - Print the driver version.<br>
- void PrintVersion(const Compilation &C, llvm::raw_ostream &OS) const;<br>
+ void PrintVersion(const Compilation &C, raw_ostream &OS) const;<br>
<br>
/// GetFilePath - Lookup \arg Name in the list of file search paths.<br>
///<br>
<br>
Modified: cfe/trunk/include/clang/Driver/OptTable.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/OptTable.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/OptTable.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Driver/OptTable.h (original)<br>
+++ cfe/trunk/include/clang/Driver/OptTable.h Wed Jul 20 02:06:53 2011<br>
@@ -10,12 +10,8 @@<br>
#ifndef CLANG_DRIVER_OPTTABLE_H<br>
#define CLANG_DRIVER_OPTTABLE_H<br>
<br>
+#include "clang/Basic/LLVM.h"<br>
#include "clang/Driver/OptSpecifier.h"<br>
-#include <cassert><br>
-<br>
-namespace llvm {<br>
- class raw_ostream;<br>
-}<br>
<br>
namespace clang {<br>
namespace driver {<br>
@@ -181,7 +177,7 @@<br>
/// \param Name - The name to use in the usage line.<br>
/// \param Title - The title to use in the usage line.<br>
/// \param ShowHidden - Whether help-hidden arguments should be shown.<br>
- void PrintHelp(llvm::raw_ostream &OS, const char *Name,<br>
+ void PrintHelp(raw_ostream &OS, const char *Name,<br>
const char *Title, bool ShowHidden = false) const;<br>
};<br>
}<br>
<br>
Modified: cfe/trunk/include/clang/Frontend/ASTConsumers.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/ASTConsumers.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/ASTConsumers.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Frontend/ASTConsumers.h (original)<br>
+++ cfe/trunk/include/clang/Frontend/ASTConsumers.h Wed Jul 20 02:06:53 2011<br>
@@ -14,8 +14,9 @@<br>
#ifndef DRIVER_ASTCONSUMERS_H<br>
#define DRIVER_ASTCONSUMERS_H<br>
<br>
+#include "clang/Basic/LLVM.h"<br>
+<br>
namespace llvm {<br>
- class raw_ostream;<br>
namespace sys { class Path; }<br>
}<br>
namespace clang {<br>
@@ -32,7 +33,7 @@<br>
// original C code. The output is intended to be in a format such that<br>
// clang could re-parse the output back into the same AST, but the<br>
// implementation is still incomplete.<br>
-ASTConsumer *CreateASTPrinter(llvm::raw_ostream *OS);<br>
+ASTConsumer *CreateASTPrinter(raw_ostream *OS);<br>
<br>
// AST dumper: dumps the raw AST in human-readable form to stderr; this is<br>
// intended for debugging.<br>
@@ -40,7 +41,7 @@<br>
<br>
// AST XML-dumper: dumps out the AST to stderr in a very detailed XML<br>
// format; this is intended for particularly intense debugging.<br>
-ASTConsumer *CreateASTDumperXML(llvm::raw_ostream &OS);<br>
+ASTConsumer *CreateASTDumperXML(raw_ostream &OS);<br>
<br>
// Graphical AST viewer: for each function definition, creates a graph of<br>
// the AST and displays it with the graph viewer "dotty". Also outputs<br>
<br>
Modified: cfe/trunk/include/clang/Frontend/ASTUnit.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/ASTUnit.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/ASTUnit.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Frontend/ASTUnit.h (original)<br>
+++ cfe/trunk/include/clang/Frontend/ASTUnit.h Wed Jul 20 02:06:53 2011<br>
@@ -687,7 +687,7 @@<br>
/// \brief Serialize this translation unit with the given output stream.<br>
///<br>
/// \returns True if an error occurred, false otherwise.<br>
- bool serialize(llvm::raw_ostream &OS);<br>
+ bool serialize(raw_ostream &OS);<br>
};<br>
<br>
} // namespace clang<br>
<br>
Modified: cfe/trunk/include/clang/Frontend/CompilerInstance.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/CompilerInstance.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/CompilerInstance.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Frontend/CompilerInstance.h (original)<br>
+++ cfe/trunk/include/clang/Frontend/CompilerInstance.h Wed Jul 20 02:06:53 2011<br>
@@ -102,10 +102,10 @@<br>
struct OutputFile {<br>
std::string Filename;<br>
std::string TempFilename;<br>
- llvm::raw_ostream *OS;<br>
+ raw_ostream *OS;<br>
<br>
OutputFile(const std::string &filename, const std::string &tempFilename,<br>
- llvm::raw_ostream *os)<br>
+ raw_ostream *os)<br>
: Filename(filename), TempFilename(tempFilename), OS(os) { }<br>
};<br>
<br>
@@ -546,7 +546,7 @@<br>
unsigned Line, unsigned Column,<br>
bool ShowMacros,<br>
bool ShowCodePatterns, bool ShowGlobals,<br>
- llvm::raw_ostream &OS);<br>
+ raw_ostream &OS);<br>
<br>
/// \brief Create the Sema object to be used for parsing.<br>
void createSema(bool CompleteTranslationUnit,<br>
<br>
Modified: cfe/trunk/include/clang/Frontend/FrontendActions.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/FrontendActions.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/FrontendActions.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Frontend/FrontendActions.h (original)<br>
+++ cfe/trunk/include/clang/Frontend/FrontendActions.h Wed Jul 20 02:06:53 2011<br>
@@ -84,7 +84,7 @@<br>
StringRef InFile,<br>
std::string &Sysroot,<br>
std::string &OutputFile,<br>
- llvm::raw_ostream *&OS,<br>
+ raw_ostream *&OS,<br>
bool &Chaining);<br>
};<br>
<br>
<br>
Modified: cfe/trunk/include/clang/Frontend/LogDiagnosticPrinter.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/LogDiagnosticPrinter.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/LogDiagnosticPrinter.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Frontend/LogDiagnosticPrinter.h (original)<br>
+++ cfe/trunk/include/clang/Frontend/LogDiagnosticPrinter.h Wed Jul 20 02:06:53 2011<br>
@@ -40,7 +40,7 @@<br>
Diagnostic::Level DiagnosticLevel;<br>
};<br>
<br>
- llvm::raw_ostream &OS;<br>
+ raw_ostream &OS;<br>
const LangOptions *LangOpts;<br>
const DiagnosticOptions *DiagOpts;<br>
<br>
@@ -54,7 +54,7 @@<br>
std::string DwarfDebugFlags;<br>
<br>
public:<br>
- LogDiagnosticPrinter(llvm::raw_ostream &OS, const DiagnosticOptions &Diags,<br>
+ LogDiagnosticPrinter(raw_ostream &OS, const DiagnosticOptions &Diags,<br>
bool OwnsOutputStream = false);<br>
virtual ~LogDiagnosticPrinter();<br>
<br>
<br>
Modified: cfe/trunk/include/clang/Frontend/TextDiagnosticPrinter.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/TextDiagnosticPrinter.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/TextDiagnosticPrinter.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Frontend/TextDiagnosticPrinter.h (original)<br>
+++ cfe/trunk/include/clang/Frontend/TextDiagnosticPrinter.h Wed Jul 20 02:06:53 2011<br>
@@ -23,7 +23,7 @@<br>
class LangOptions;<br>
<br>
class TextDiagnosticPrinter : public DiagnosticClient {<br>
- llvm::raw_ostream &OS;<br>
+ raw_ostream &OS;<br>
const LangOptions *LangOpts;<br>
const DiagnosticOptions *DiagOpts;<br>
<br>
@@ -36,7 +36,7 @@<br>
std::string Prefix;<br>
<br>
public:<br>
- TextDiagnosticPrinter(llvm::raw_ostream &os, const DiagnosticOptions &diags,<br>
+ TextDiagnosticPrinter(raw_ostream &os, const DiagnosticOptions &diags,<br>
bool OwnsOutputStream = false);<br>
virtual ~TextDiagnosticPrinter();<br>
<br>
<br>
Modified: cfe/trunk/include/clang/Frontend/Utils.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/Utils.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/Utils.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Frontend/Utils.h (original)<br>
+++ cfe/trunk/include/clang/Frontend/Utils.h Wed Jul 20 02:06:53 2011<br>
@@ -69,7 +69,7 @@<br>
void ProcessWarningOptions(Diagnostic &Diags, const DiagnosticOptions &Opts);<br>
<br>
/// DoPrintPreprocessedInput - Implement -E mode.<br>
-void DoPrintPreprocessedInput(Preprocessor &PP, llvm::raw_ostream* OS,<br>
+void DoPrintPreprocessedInput(Preprocessor &PP, raw_ostream* OS,<br>
const PreprocessorOutputOptions &Opts);<br>
<br>
/// AttachDependencyFileGen - Create a dependency file generator, and attach<br>
<br>
Modified: cfe/trunk/include/clang/Index/ASTLocation.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Index/ASTLocation.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Index/ASTLocation.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Index/ASTLocation.h (original)<br>
+++ cfe/trunk/include/clang/Index/ASTLocation.h Wed Jul 20 02:06:53 2011<br>
@@ -150,7 +150,7 @@<br>
<br>
SourceRange getSourceRange() const;<br>
<br>
- void print(llvm::raw_ostream &OS) const;<br>
+ void print(raw_ostream &OS) const;<br>
};<br>
<br>
/// \brief Like ASTLocation but also contains the TranslationUnit that the<br>
<br>
Modified: cfe/trunk/include/clang/Index/CallGraph.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Index/CallGraph.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Index/CallGraph.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Index/CallGraph.h (original)<br>
+++ cfe/trunk/include/clang/Index/CallGraph.h Wed Jul 20 02:06:53 2011<br>
@@ -94,7 +94,7 @@<br>
<br>
Decl *getDecl(CallGraphNode *Node);<br>
<br>
- void print(llvm::raw_ostream &os);<br>
+ void print(raw_ostream &os);<br>
void dump();<br>
<br>
void ViewCallGraph() const;<br>
<br>
Modified: cfe/trunk/include/clang/Parse/Parser.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Parse/Parser.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Parse/Parser.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Parse/Parser.h (original)<br>
+++ cfe/trunk/include/clang/Parse/Parser.h Wed Jul 20 02:06:53 2011<br>
@@ -42,7 +42,7 @@<br>
const Parser &P;<br>
public:<br>
PrettyStackTraceParserEntry(const Parser &p) : P(p) {}<br>
- virtual void print(llvm::raw_ostream &OS) const;<br>
+ virtual void print(raw_ostream &OS) const;<br>
};<br>
<br>
/// PrecedenceLevels - These are precedences for the binary/ternary<br>
<br>
Modified: cfe/trunk/include/clang/Rewrite/ASTConsumers.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Rewrite/ASTConsumers.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Rewrite/ASTConsumers.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Rewrite/ASTConsumers.h (original)<br>
+++ cfe/trunk/include/clang/Rewrite/ASTConsumers.h Wed Jul 20 02:06:53 2011<br>
@@ -14,11 +14,9 @@<br>
#ifndef REWRITE_ASTCONSUMERS_H<br>
#define REWRITE_ASTCONSUMERS_H<br>
<br>
+#include "clang/Basic/LLVM.h"<br>
#include <string><br>
<br>
-namespace llvm {<br>
- class raw_ostream;<br>
-}<br>
namespace clang {<br>
<br>
class ASTConsumer;<br>
@@ -29,14 +27,14 @@<br>
// ObjC rewriter: attempts to rewrite ObjC constructs into pure C code.<br>
// This is considered experimental, and only works with Apple's ObjC runtime.<br>
ASTConsumer *CreateObjCRewriter(const std::string &InFile,<br>
- llvm::raw_ostream *OS,<br>
+ raw_ostream *OS,<br>
Diagnostic &Diags,<br>
const LangOptions &LOpts,<br>
bool SilenceRewriteMacroWarning);<br>
<br>
/// CreateHTMLPrinter - Create an AST consumer which rewrites source code to<br>
/// HTML with syntax highlighting suitable for viewing in a web-browser.<br>
-ASTConsumer *CreateHTMLPrinter(llvm::raw_ostream *OS, Preprocessor &PP,<br>
+ASTConsumer *CreateHTMLPrinter(raw_ostream *OS, Preprocessor &PP,<br>
bool SyntaxHighlight = true,<br>
bool HighlightMacros = true);<br>
<br>
<br>
Modified: cfe/trunk/include/clang/Rewrite/FixItRewriter.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Rewrite/FixItRewriter.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Rewrite/FixItRewriter.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Rewrite/FixItRewriter.h (original)<br>
+++ cfe/trunk/include/clang/Rewrite/FixItRewriter.h Wed Jul 20 02:06:53 2011<br>
@@ -79,7 +79,7 @@<br>
/// \brief Write a single modified source file.<br>
///<br>
/// \returns true if there was an error, false otherwise.<br>
- bool WriteFixedFile(FileID ID, llvm::raw_ostream &OS);<br>
+ bool WriteFixedFile(FileID ID, raw_ostream &OS);<br>
<br>
/// \brief Write the modified source files.<br>
///<br>
<br>
Modified: cfe/trunk/include/clang/Rewrite/Rewriter.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Rewrite/Rewriter.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Rewrite/Rewriter.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Rewrite/Rewriter.h (original)<br>
+++ cfe/trunk/include/clang/Rewrite/Rewriter.h Wed Jul 20 02:06:53 2011<br>
@@ -54,7 +54,7 @@<br>
iterator end() const { return Buffer.end(); }<br>
unsigned size() const { return Buffer.size(); }<br>
<br>
- llvm::raw_ostream &write(llvm::raw_ostream &) const;<br>
+ raw_ostream &write(raw_ostream &) const;<br>
<br>
/// RemoveText - Remove the specified text.<br>
void RemoveText(unsigned OrigOffset, unsigned Size,<br>
<br>
Modified: cfe/trunk/include/clang/Rewrite/Rewriters.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Rewrite/Rewriters.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Rewrite/Rewriters.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Rewrite/Rewriters.h (original)<br>
+++ cfe/trunk/include/clang/Rewrite/Rewriters.h Wed Jul 20 02:06:53 2011<br>
@@ -14,17 +14,16 @@<br>
#ifndef LLVM_CLANG_REWRITE_REWRITERS_H<br>
#define LLVM_CLANG_REWRITE_REWRITERS_H<br>
<br>
-#include "llvm/ADT/StringRef.h"<br>
-#include "llvm/Support/raw_ostream.h"<br>
+#include "clang/Basic/LLVM.h"<br>
<br>
namespace clang {<br>
class Preprocessor;<br>
<br>
/// RewriteMacrosInInput - Implement -rewrite-macros mode.<br>
-void RewriteMacrosInInput(Preprocessor &PP, llvm::raw_ostream* OS);<br>
+void RewriteMacrosInInput(Preprocessor &PP, raw_ostream *OS);<br>
<br>
/// DoRewriteTest - A simple test for the TokenRewriter class.<br>
-void DoRewriteTest(Preprocessor &PP, llvm::raw_ostream* OS);<br>
+void DoRewriteTest(Preprocessor &PP, raw_ostream *OS);<br>
<br>
} // end namespace clang<br>
<br>
<br>
Modified: cfe/trunk/include/clang/Sema/CodeCompleteConsumer.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/CodeCompleteConsumer.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/CodeCompleteConsumer.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Sema/CodeCompleteConsumer.h (original)<br>
+++ cfe/trunk/include/clang/Sema/CodeCompleteConsumer.h Wed Jul 20 02:06:53 2011<br>
@@ -466,7 +466,7 @@<br>
const char *CopyString(StringRef String);<br>
<br>
/// \brief Copy the given string into this allocator.<br>
- const char *CopyString(llvm::Twine String);<br>
+ const char *CopyString(Twine String);<br>
<br>
// \brief Copy the given string into this allocator.<br>
const char *CopyString(const char *String) {<br>
@@ -709,7 +709,7 @@<br>
}<br>
<br>
<br>
-llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,<br>
+raw_ostream &operator<<(raw_ostream &OS,<br>
const CodeCompletionString &CCS);<br>
<br>
/// \brief Abstract interface for a consumer of code-completion<br>
@@ -850,7 +850,7 @@<br>
/// receives in a simple format.<br>
class PrintingCodeCompleteConsumer : public CodeCompleteConsumer {<br>
/// \brief The raw output stream.<br>
- llvm::raw_ostream &OS;<br>
+ raw_ostream &OS;<br>
<br>
CodeCompletionAllocator Allocator;<br>
<br>
@@ -859,7 +859,7 @@<br>
/// results to the given raw output stream.<br>
PrintingCodeCompleteConsumer(bool IncludeMacros, bool IncludeCodePatterns,<br>
bool IncludeGlobals,<br>
- llvm::raw_ostream &OS)<br>
+ raw_ostream &OS)<br>
: CodeCompleteConsumer(IncludeMacros, IncludeCodePatterns, IncludeGlobals,<br>
false), OS(OS) {}<br>
<br>
<br>
Modified: cfe/trunk/include/clang/Sema/Initialization.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Initialization.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Initialization.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Sema/Initialization.h (original)<br>
+++ cfe/trunk/include/clang/Sema/Initialization.h Wed Jul 20 02:06:53 2011<br>
@@ -857,7 +857,7 @@<br>
<br>
/// \brief Dump a representation of this initialization sequence to<br>
/// the given stream, for debugging purposes.<br>
- void dump(llvm::raw_ostream &OS) const;<br>
+ void dump(raw_ostream &OS) const;<br>
<br>
/// \brief Dump a representation of this initialization sequence to<br>
/// standard error, for debugging purposes.<br>
<br>
Modified: cfe/trunk/include/clang/Sema/Lookup.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Lookup.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Lookup.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Sema/Lookup.h (original)<br>
+++ cfe/trunk/include/clang/Sema/Lookup.h Wed Jul 20 02:06:53 2011<br>
@@ -468,7 +468,7 @@<br>
configure();<br>
}<br>
<br>
- void print(llvm::raw_ostream &);<br>
+ void print(raw_ostream &);<br>
<br>
/// Suppress the diagnostics that would normally fire because of this<br>
/// lookup. This happens during (e.g.) redeclaration lookups.<br>
<br>
Modified: cfe/trunk/include/clang/Sema/PrettyDeclStackTrace.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/PrettyDeclStackTrace.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/PrettyDeclStackTrace.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Sema/PrettyDeclStackTrace.h (original)<br>
+++ cfe/trunk/include/clang/Sema/PrettyDeclStackTrace.h Wed Jul 20 02:06:53 2011<br>
@@ -38,7 +38,7 @@<br>
PrettyDeclStackTraceEntry(Sema &S, Decl *D, SourceLocation Loc, const char *Msg)<br>
: S(S), TheDecl(D), Loc(Loc), Message(Msg) {}<br>
<br>
- virtual void print(llvm::raw_ostream &OS) const;<br>
+ virtual void print(raw_ostream &OS) const;<br>
};<br>
<br>
}<br>
<br>
Modified: cfe/trunk/include/clang/Serialization/ASTWriter.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Serialization/ASTWriter.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Serialization/ASTWriter.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Serialization/ASTWriter.h (original)<br>
+++ cfe/trunk/include/clang/Serialization/ASTWriter.h Wed Jul 20 02:06:53 2011<br>
@@ -617,7 +617,7 @@<br>
const Preprocessor &PP;<br>
std::string OutputFile;<br>
const char *isysroot;<br>
- llvm::raw_ostream *Out;<br>
+ raw_ostream *Out;<br>
Sema *SemaPtr;<br>
MemorizeStatCalls *StatCalls; // owned by the FileManager<br>
std::vector<unsigned char> Buffer;<br>
@@ -631,7 +631,7 @@<br>
<br>
public:<br>
PCHGenerator(const Preprocessor &PP, const std::string &OutputFile, bool Chaining,<br>
- const char *isysroot, llvm::raw_ostream *Out);<br>
+ const char *isysroot, raw_ostream *Out);<br>
virtual void InitializeSema(Sema &S) { SemaPtr = &S; }<br>
virtual void HandleTranslationUnit(ASTContext &Ctx);<br>
virtual ASTMutationListener *GetASTMutationListener();<br>
<br>
Modified: cfe/trunk/include/clang/StaticAnalyzer/Core/CheckerProvider.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/CheckerProvider.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/CheckerProvider.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/StaticAnalyzer/Core/CheckerProvider.h (original)<br>
+++ cfe/trunk/include/clang/StaticAnalyzer/Core/CheckerProvider.h Wed Jul 20 02:06:53 2011<br>
@@ -48,7 +48,7 @@<br>
virtual ~CheckerProvider();<br>
virtual void registerCheckers(CheckerManager &checkerMgr,<br>
CheckerOptInfo *checkOpts, unsigned numCheckOpts) = 0;<br>
- virtual void printHelp(llvm::raw_ostream &OS) = 0;<br>
+ virtual void printHelp(raw_ostream &OS) = 0;<br>
};<br>
<br>
} // end ento namespace<br>
<br>
Modified: cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h (original)<br>
+++ cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h Wed Jul 20 02:06:53 2011<br>
@@ -51,7 +51,7 @@<br>
virtual const GRState *removeDeadBindings(const GRState *state,<br>
SymbolReaper& SymReaper) = 0;<br>
<br>
- virtual void print(const GRState *state, llvm::raw_ostream& Out,<br>
+ virtual void print(const GRState *state, raw_ostream& Out,<br>
const char* nl, const char *sep) = 0;<br>
<br>
virtual void EndPath(const GRState *state) {}<br>
<br>
Modified: cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/GRState.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/GRState.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/GRState.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/GRState.h (original)<br>
+++ cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/GRState.h Wed Jul 20 02:06:53 2011<br>
@@ -347,17 +347,17 @@<br>
class Printer {<br>
public:<br>
virtual ~Printer() {}<br>
- virtual void Print(llvm::raw_ostream& Out, const GRState* state,<br>
+ virtual void Print(raw_ostream& Out, const GRState* state,<br>
const char* nl, const char* sep) = 0;<br>
};<br>
<br>
// Pretty-printing.<br>
- void print(llvm::raw_ostream& Out, CFG &C, const char *nl = "\n",<br>
+ void print(raw_ostream& Out, CFG &C, const char *nl = "\n",<br>
const char *sep = "") const;<br>
<br>
void printStdErr(CFG &C) const;<br>
<br>
- void printDOT(llvm::raw_ostream& Out, CFG &C) const;<br>
+ void printDOT(raw_ostream& Out, CFG &C) const;<br>
<br>
private:<br>
/// Increments the number of times this state is referenced by ExplodeNodes.<br>
<br>
Modified: cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h (original)<br>
+++ cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h Wed Jul 20 02:06:53 2011<br>
@@ -136,7 +136,7 @@<br>
/// Compute the offset within the top level memory object.<br>
RegionOffset getAsOffset() const;<br>
<br>
- virtual void dumpToStream(llvm::raw_ostream& os) const;<br>
+ virtual void dumpToStream(raw_ostream& os) const;<br>
<br>
void dump() const;<br>
<br>
@@ -197,7 +197,7 @@<br>
public:<br>
void Profile(llvm::FoldingSetNodeID &ID) const;<br>
<br>
- void dumpToStream(llvm::raw_ostream& os) const;<br>
+ void dumpToStream(raw_ostream& os) const;<br>
<br>
const CodeTextRegion *getCodeRegion() const { return CR; }<br>
<br>
@@ -214,7 +214,7 @@<br>
<br>
public:<br>
<br>
- void dumpToStream(llvm::raw_ostream& os) const;<br>
+ void dumpToStream(raw_ostream& os) const;<br>
<br>
static bool classof(const MemRegion *R) {<br>
return R->getKind() == NonStaticGlobalSpaceRegionKind;<br>
@@ -341,7 +341,7 @@<br>
static void ProfileRegion(llvm::FoldingSetNodeID& ID, const Expr* Ex,<br>
unsigned Cnt, const MemRegion *superRegion);<br>
<br>
- void dumpToStream(llvm::raw_ostream& os) const;<br>
+ void dumpToStream(raw_ostream& os) const;<br>
<br>
static bool classof(const MemRegion* R) {<br>
return R->getKind() == AllocaRegionKind;<br>
@@ -415,7 +415,7 @@<br>
return FD;<br>
}<br>
<br>
- virtual void dumpToStream(llvm::raw_ostream& os) const;<br>
+ virtual void dumpToStream(raw_ostream& os) const;<br>
<br>
void Profile(llvm::FoldingSetNodeID& ID) const;<br>
<br>
@@ -456,7 +456,7 @@<br>
<br>
AnalysisContext *getAnalysisContext() const { return AC; }<br>
<br>
- virtual void dumpToStream(llvm::raw_ostream& os) const;<br>
+ virtual void dumpToStream(raw_ostream& os) const;<br>
<br>
void Profile(llvm::FoldingSetNodeID& ID) const;<br>
<br>
@@ -518,7 +518,7 @@<br>
referenced_vars_iterator referenced_vars_begin() const;<br>
referenced_vars_iterator referenced_vars_end() const;<br>
<br>
- virtual void dumpToStream(llvm::raw_ostream& os) const;<br>
+ virtual void dumpToStream(raw_ostream& os) const;<br>
<br>
void Profile(llvm::FoldingSetNodeID& ID) const;<br>
<br>
@@ -559,7 +559,7 @@<br>
SymbolRef sym,<br>
const MemRegion* superRegion);<br>
<br>
- void dumpToStream(llvm::raw_ostream& os) const;<br>
+ void dumpToStream(raw_ostream& os) const;<br>
<br>
static bool classof(const MemRegion* R) {<br>
return R->getKind() == SymbolicRegionKind;<br>
@@ -595,7 +595,7 @@<br>
ProfileRegion(ID, Str, superRegion);<br>
}<br>
<br>
- void dumpToStream(llvm::raw_ostream& os) const;<br>
+ void dumpToStream(raw_ostream& os) const;<br>
<br>
static bool classof(const MemRegion* R) {<br>
return R->getKind() == StringRegionKind;<br>
@@ -625,7 +625,7 @@<br>
<br>
void Profile(llvm::FoldingSetNodeID& ID) const;<br>
<br>
- void dumpToStream(llvm::raw_ostream& os) const;<br>
+ void dumpToStream(raw_ostream& os) const;<br>
<br>
const CompoundLiteralExpr* getLiteralExpr() const { return CL; }<br>
<br>
@@ -680,7 +680,7 @@<br>
return getDecl()->getType();<br>
}<br>
<br>
- void dumpToStream(llvm::raw_ostream& os) const;<br>
+ void dumpToStream(raw_ostream& os) const;<br>
<br>
static bool classof(const MemRegion* R) {<br>
return R->getKind() == VarRegionKind;<br>
@@ -707,7 +707,7 @@<br>
return QualType(ThisPointerTy, 0);<br>
}<br>
<br>
- void dumpToStream(llvm::raw_ostream& os) const;<br>
+ void dumpToStream(raw_ostream& os) const;<br>
<br>
static bool classof(const MemRegion* R) {<br>
return R->getKind() == CXXThisRegionKind;<br>
@@ -725,7 +725,7 @@<br>
<br>
public:<br>
<br>
- void dumpToStream(llvm::raw_ostream& os) const;<br>
+ void dumpToStream(raw_ostream& os) const;<br>
<br>
const FieldDecl* getDecl() const { return cast<FieldDecl>(D); }<br>
<br>
@@ -762,7 +762,7 @@<br>
const ObjCIvarDecl* getDecl() const { return cast<ObjCIvarDecl>(D); }<br>
QualType getValueType() const { return getDecl()->getType(); }<br>
<br>
- void dumpToStream(llvm::raw_ostream& os) const;<br>
+ void dumpToStream(raw_ostream& os) const;<br>
<br>
static bool classof(const MemRegion* R) {<br>
return R->getKind() == ObjCIvarRegionKind;<br>
@@ -789,7 +789,7 @@<br>
CharUnits getOffset() const { return Offset; }<br>
const MemRegion *getRegion() const { return Region; }<br>
<br>
- void dumpToStream(llvm::raw_ostream& os) const;<br>
+ void dumpToStream(raw_ostream& os) const;<br>
void dump() const;<br>
};<br>
<br>
@@ -824,7 +824,7 @@<br>
/// Compute the offset within the array. The array might also be a subobject.<br>
RegionRawOffset getAsArrayOffset() const;<br>
<br>
- void dumpToStream(llvm::raw_ostream& os) const;<br>
+ void dumpToStream(raw_ostream& os) const;<br>
<br>
void Profile(llvm::FoldingSetNodeID& ID) const;<br>
<br>
@@ -850,7 +850,7 @@<br>
return Ex->getType();<br>
}<br>
<br>
- void dumpToStream(llvm::raw_ostream& os) const;<br>
+ void dumpToStream(raw_ostream& os) const;<br>
<br>
void Profile(llvm::FoldingSetNodeID &ID) const;<br>
<br>
@@ -877,7 +877,7 @@<br>
<br>
QualType getValueType() const;<br>
<br>
- void dumpToStream(llvm::raw_ostream& os) const;<br>
+ void dumpToStream(raw_ostream& os) const;<br>
<br>
void Profile(llvm::FoldingSetNodeID &ID) const;<br>
<br>
<br>
Modified: cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h (original)<br>
+++ cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h Wed Jul 20 02:06:53 2011<br>
@@ -142,7 +142,7 @@<br>
<br>
const MemRegion *getAsRegion() const;<br>
<br>
- void dumpToStream(llvm::raw_ostream& OS) const;<br>
+ void dumpToStream(raw_ostream& OS) const;<br>
void dump() const;<br>
<br>
// Iterators.<br>
@@ -240,7 +240,7 @@<br>
: DefinedSVal(d, false, SubKind) {}<br>
<br>
public:<br>
- void dumpToStream(llvm::raw_ostream& Out) const;<br>
+ void dumpToStream(raw_ostream& Out) const;<br>
<br>
// Implement isa<T> support.<br>
static inline bool classof(const SVal* V) {<br>
@@ -254,7 +254,7 @@<br>
: DefinedSVal(const_cast<void*>(D), true, SubKind) {}<br>
<br>
public:<br>
- void dumpToStream(llvm::raw_ostream& Out) const;<br>
+ void dumpToStream(raw_ostream& Out) const;<br>
<br>
Loc(const Loc& X) : DefinedSVal(X.Data, true, X.getSubKind()) {}<br>
<br>
@@ -533,7 +533,7 @@<br>
} // end clang namespace<br>
<br>
namespace llvm {<br>
-static inline llvm::raw_ostream& operator<<(llvm::raw_ostream& os,<br>
+static inline raw_ostream& operator<<(raw_ostream& os,<br>
clang::ento::SVal V) {<br>
V.dumpToStream(os);<br>
return os;<br>
<br>
Modified: cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h (original)<br>
+++ cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h Wed Jul 20 02:06:53 2011<br>
@@ -197,7 +197,7 @@<br>
virtual StoreRef enterStackFrame(const GRState *state,<br>
const StackFrameContext *frame);<br>
<br>
- virtual void print(Store store, llvm::raw_ostream& Out,<br>
+ virtual void print(Store store, raw_ostream& Out,<br>
const char* nl, const char *sep) = 0;<br>
<br>
class BindingsHandler {<br>
<br>
Modified: cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h (original)<br>
+++ cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h Wed Jul 20 02:06:53 2011<br>
@@ -58,7 +58,7 @@<br>
<br>
void dump() const;<br>
<br>
- virtual void dumpToStream(llvm::raw_ostream &os) const = 0;<br>
+ virtual void dumpToStream(raw_ostream &os) const = 0;<br>
<br>
virtual QualType getType(ASTContext&) const = 0;<br>
virtual void Profile(llvm::FoldingSetNodeID& profile) = 0;<br>
@@ -109,7 +109,7 @@<br>
Profile(profile, R);<br>
}<br>
<br>
- void dumpToStream(llvm::raw_ostream &os) const;<br>
+ void dumpToStream(raw_ostream &os) const;<br>
<br>
QualType getType(ASTContext&) const;<br>
<br>
@@ -138,7 +138,7 @@<br>
<br>
QualType getType(ASTContext&) const;<br>
<br>
- void dumpToStream(llvm::raw_ostream &os) const;<br>
+ void dumpToStream(raw_ostream &os) const;<br>
<br>
static void Profile(llvm::FoldingSetNodeID& profile, const Stmt* S,<br>
QualType T, unsigned Count, const void* SymbolTag) {<br>
@@ -174,7 +174,7 @@<br>
<br>
QualType getType(ASTContext&) const;<br>
<br>
- void dumpToStream(llvm::raw_ostream &os) const;<br>
+ void dumpToStream(raw_ostream &os) const;<br>
<br>
static void Profile(llvm::FoldingSetNodeID& profile, SymbolRef parent,<br>
const TypedRegion *r) {<br>
@@ -207,7 +207,7 @@<br>
<br>
QualType getType(ASTContext&) const;<br>
<br>
- void dumpToStream(llvm::raw_ostream &os) const;<br>
+ void dumpToStream(raw_ostream &os) const;<br>
<br>
static void Profile(llvm::FoldingSetNodeID& profile, const SubRegion *R) {<br>
profile.AddInteger((unsigned) ExtentKind);<br>
@@ -246,7 +246,7 @@<br>
<br>
QualType getType(ASTContext&) const;<br>
<br>
- void dumpToStream(llvm::raw_ostream &os) const;<br>
+ void dumpToStream(raw_ostream &os) const;<br>
<br>
static void Profile(llvm::FoldingSetNodeID& profile, const MemRegion *R,<br>
const Stmt *S, QualType T, unsigned Count,<br>
@@ -287,7 +287,7 @@<br>
<br>
BinaryOperator::Opcode getOpcode() const { return Op; }<br>
<br>
- void dumpToStream(llvm::raw_ostream &os) const;<br>
+ void dumpToStream(raw_ostream &os) const;<br>
<br>
const SymExpr *getLHS() const { return LHS; }<br>
const llvm::APSInt &getRHS() const { return RHS; }<br>
@@ -332,7 +332,7 @@<br>
// generation of virtual functions.<br>
QualType getType(ASTContext& C) const { return T; }<br>
<br>
- void dumpToStream(llvm::raw_ostream &os) const;<br>
+ void dumpToStream(raw_ostream &os) const;<br>
<br>
static void Profile(llvm::FoldingSetNodeID& ID, const SymExpr *lhs,<br>
BinaryOperator::Opcode op, const SymExpr *rhs, QualType t) {<br>
@@ -480,7 +480,7 @@<br>
} // end clang namespace<br>
<br>
namespace llvm {<br>
-static inline llvm::raw_ostream& operator<<(llvm::raw_ostream& os,<br>
+static inline raw_ostream& operator<<(raw_ostream& os,<br>
const clang::ento::SymExpr *SE) {<br>
SE->dumpToStream(os);<br>
return os;<br>
<br>
Modified: cfe/trunk/include/clang/StaticAnalyzer/Frontend/FrontendActions.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Frontend/FrontendActions.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Frontend/FrontendActions.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/StaticAnalyzer/Frontend/FrontendActions.h (original)<br>
+++ cfe/trunk/include/clang/StaticAnalyzer/Frontend/FrontendActions.h Wed Jul 20 02:06:53 2011<br>
@@ -26,7 +26,7 @@<br>
StringRef InFile);<br>
};<br>
<br>
-void printCheckerHelp(llvm::raw_ostream &OS);<br>
+void printCheckerHelp(raw_ostream &OS);<br>
<br>
} // end GR namespace<br>
<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CGRecordLayout.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGRecordLayout.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGRecordLayout.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CGRecordLayout.h (original)<br>
+++ cfe/trunk/lib/CodeGen/CGRecordLayout.h Wed Jul 20 02:06:53 2011<br>
@@ -144,7 +144,7 @@<br>
<br>
/// @}<br>
<br>
- void print(llvm::raw_ostream &OS) const;<br>
+ void print(raw_ostream &OS) const;<br>
void dump() const;<br>
<br>
/// \brief Given a bit-field decl, build an appropriate helper object for<br>
@@ -270,7 +270,7 @@<br>
return it->second;<br>
}<br>
<br>
- void print(llvm::raw_ostream &OS) const;<br>
+ void print(raw_ostream &OS) const;<br>
void dump() const;<br>
};<br>
<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CodeGenFunction.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.h?rev=135577&r1=135576&r2=135577&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.h?rev=135577&r1=135576&r2=135577&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CodeGenFunction.h (original)<br>
+++ cfe/trunk/lib/CodeGen/CodeGenFunction.h Wed Jul 20 02:06:53 2011<br>
@@ -1487,7 +1487,7 @@<br>
/// block. The caller is responsible for setting an appropriate alignment on<br>
/// the alloca.<br>
llvm::AllocaInst *CreateTempAlloca(llvm::Type *Ty,<br>
- const llvm::Twine &Name = "tmp");<br>
+ const Twine &Name = "tmp");<br>
<br>
/// InitTempAlloca - Provide an initial value for the given alloca.<br>
void InitTempAlloca(llvm::AllocaInst *Alloca, llvm::Value *Value);<br>
@@ -1497,15 +1497,15 @@<br>
/// value needs to be stored into an alloca (for example, to avoid explicit<br>
/// PHI construction), but the type is the IR type, not the type appropriate<br>
/// for storing in memory.<br>
- llvm::AllocaInst *CreateIRTemp(QualType T, const llvm::Twine &Name = "tmp");<br>
+ llvm::AllocaInst *CreateIRTemp(QualType T, const Twine &Name = "tmp");<br>
<br>
/// CreateMemTemp - Create a temporary memory object of the given type, with<br>
/// appropriate alignment.<br>
- llvm::AllocaInst *CreateMemTemp(QualType T, const llvm::Twine &Name = "tmp");<br>
+ llvm::AllocaInst *CreateMemTemp(QualType T, const Twine &Name = "tmp");<br>
<br>
/// CreateAggTemp - Create a temporary memory object for the given<br>
/// aggregate type.<br>
- AggValueSlot CreateAggTemp(QualType T, const llvm::Twine &Name = "tmp") {<br>
+ AggValueSlot CreateAggTemp(QualType T, const Twine &Name = "tmp") {<br>
return AggValueSlot::forAddr(CreateMemTemp(T, Name), T.getQualifiers(),<br>
false);<br>
}<br>
@@ -2075,9 +2075,9 @@<br>
<br>
llvm::CallSite EmitCallOrInvoke(llvm::Value *Callee,<br>
llvm::ArrayRef<llvm::Value *> Args,<br>
- const llvm::Twine &Name = "");<br>
+ const Twine &Name = "");<br>
llvm::CallSite EmitCallOrInvoke(llvm::Value *Callee,<br>
- const llvm::Twine &Name = "");<br>
+ const Twine &Name = "");<br>
<br>
llvm::Value *BuildVirtualCall(const CXXMethodDecl *MD, llvm::Value *This,<br>
llvm::Type *Ty);<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br><br clear="all"><br>-- <br>Jon Mulder<br><div>E <a href="mailto:mulderje@muohio.edu" target="_blank">mulderje@muohio.edu</a></div><br>
</div>