[llvm-commits] [dragonegg] r154740 - in /dragonegg/trunk/include/dragonegg: Debug.h Internals.h

[Duncan Sands]

Author: baldrick
Date: Sat Apr 14 04:37:44 2012
New Revision: 154740

URL: http://llvm.org/viewvc/llvm-project?rev=154740&view=rev
Log:
Move the DebugInfo class out of the llvm namespace.  I expect this to fix
compilation by g++-4.3 which fails to resolve "isa" template uses inside
DebugInfo methods.

Modified:
    dragonegg/trunk/include/dragonegg/Debug.h
    dragonegg/trunk/include/dragonegg/Internals.h

Modified: dragonegg/trunk/include/dragonegg/Debug.h
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/include/dragonegg/Debug.h?rev=154740&r1=154739&r2=154740&view=diff
==============================================================================
--- dragonegg/trunk/include/dragonegg/Debug.h (original)
+++ dragonegg/trunk/include/dragonegg/Debug.h Sat Apr 14 04:37:44 2012
@@ -34,14 +34,14 @@
 // System headers
 #include <map>
 
-namespace llvm {
-
 // Forward declarations
-class AllocaInst;
-class BasicBlock;
-class CallInst;
-class Function;
-class Module;
+namespace llvm {
+  class AllocaInst;
+  class BasicBlock;
+  class CallInst;
+  class Function;
+  class Module;
+}
 
 /// DIFactory - This object assists with the construction of the various
 /// descriptors.
@@ -361,6 +361,4 @@
   StringRef getFunctionName(tree_node *FnDecl);
 };
 
-} // end namespace llvm
-
 #endif /* DRAGONEGG_DEBUG_H */

Modified: dragonegg/trunk/include/dragonegg/Internals.h
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/include/dragonegg/Internals.h?rev=154740&r1=154739&r2=154740&view=diff
==============================================================================
--- dragonegg/trunk/include/dragonegg/Internals.h (original)
+++ dragonegg/trunk/include/dragonegg/Internals.h Sat Apr 14 04:37:44 2012
@@ -57,10 +57,10 @@
   class Type;
   class TargetMachine;
   class TargetData;
-  class DebugInfo;
   template<typename> class AssertingVH;
   template<typename> class TrackingVH;
 }
+class DebugInfo;
 using namespace llvm;
 
 typedef IRBuilder<true, TargetFolder> LLVMBuilder;
@@ -73,7 +73,7 @@
 
 /// TheDebugInfo - This object is responsible for gather all debug information.
 /// If it's value is NULL then no debug information should be gathered.
-extern llvm::DebugInfo *TheDebugInfo;
+extern DebugInfo *TheDebugInfo;
 
 /// TheTarget - The current target being compiled for.
 ///