diff --git a/include/llvm/Type.h b/include/llvm/Type.h
index e7a192bac95..99e038af8fb 100644
--- a/include/llvm/Type.h
+++ b/include/llvm/Type.h
@@ -228,8 +228,12 @@ public:
 #include "llvm/Type.def"
 
 private:
-  class TypeIterator : public std::bidirectional_iterator<const Type,
-		                                          ptrdiff_t> {
+  class TypeIterator
+#if __GNUC__ == 3
+    : public std::iterator<std::bidirectional_iterator_tag, const Type> {
+#else
+    : public std::bidirectional_iterator<const Type, ptrdiff_t> {
+#endif
     const Type * const Ty;
     unsigned Idx;