4 files changed, 24 insertions, 22 deletions
diff --git a/src/ir/comp.rs b/src/ir/comp.rs
index 814204c2..9a6548a7 100644
--- a/src/ir/comp.rs
+++ b/src/ir/comp.rs
@@ -597,14 +597,6 @@ impl CompInfo {
                     ci.packed = true;
                 }
                 CXCursor_TemplateTypeParameter => {
-                    // Yes! You can arrive here with an empty template parameter
-                    // name! Awesome, isn't it?
-                    //
-                    // see tests/headers/empty_template_param_name.hpp
-                    if cur.spelling().is_empty() {
-                        return CXChildVisit_Continue;
-                    }
-
                     let param = Item::named_type(None, cur, ctx)
                         .expect("Item::named_type should't fail when pointing \
                                  at a TemplateTypeParameter");
diff --git a/src/ir/context.rs b/src/ir/context.rs
index 6795a864..1dc4f4a4 100644
--- a/src/ir/context.rs
+++ b/src/ir/context.rs
@@ -1032,10 +1032,10 @@ impl<'ctx> BindgenContext<'ctx> {
                     }
 
                     return self.instantiate_template(with_id,
-                                              id,
-                                              parent_id,
-                                              ty,
-                                              location)
+                                                     id,
+                                                     parent_id,
+                                                     ty,
+                                                     location)
                         .or_else(|| Some(id));
                 }
 
diff --git a/src/ir/item.rs b/src/ir/item.rs
index 93df9c77..89422e87 100644
--- a/src/ir/item.rs
+++ b/src/ir/item.rs
@@ -19,6 +19,7 @@ use std::collections::BTreeSet;
 use std::fmt::Write;
 use std::io;
 use std::iter;
+use regex;
 
 /// A trait to get the canonical name from an item.
 ///
@@ -1313,8 +1314,19 @@ impl ClangItemParser for Item {
         fn is_template_with_spelling(refd: &clang::Cursor,
                                      spelling: &str)
                                      -> bool {
-            refd.kind() == clang_sys::CXCursor_TemplateTypeParameter &&
-            refd.spelling() == spelling
+            lazy_static! {
+                static ref ANON_TYPE_PARAM_RE: regex::Regex =
+                    regex::Regex::new(r"^type\-parameter\-\d+\-\d+$").unwrap();
+            }
+
+            if refd.kind() != clang_sys::CXCursor_TemplateTypeParameter {
+                return false;
+            }
+
+            let refd_spelling = refd.spelling();
+            refd_spelling == spelling ||
+                // Allow for anonymous template parameters.
+                (refd_spelling.is_empty() && ANON_TYPE_PARAM_RE.is_match(spelling.as_ref()))
         }
 
         let definition = if is_template_with_spelling(&location,
diff --git a/src/ir/ty.rs b/src/ir/ty.rs
index 6c8e7363..54925696 100644
--- a/src/ir/ty.rs
+++ b/src/ir/ty.rs
@@ -292,8 +292,12 @@ impl Type {
 
     /// Creates a new named type, with name `name`.
     pub fn named(name: String) -> Self {
-        assert!(!name.is_empty());
-        Self::new(Some(name), None, TypeKind::Named, false)
+        let name = if name.is_empty() {
+            None
+        } else {
+            Some(name)
+        };
+        Self::new(name, None, TypeKind::Named, false)
     }
 
     /// Is this a floating point type?
@@ -1127,12 +1131,6 @@ impl Type {
                                                               ctx);
                                         }
                                         CXCursor_TemplateTypeParameter => {
-                                            // See the comment in src/ir/comp.rs
-                                            // about the same situation.
-                                            if cur.spelling().is_empty() {
-                                                return CXChildVisit_Continue;
-                                            }
-
                                             let param =
                                                 Item::named_type(None,
                                                                  cur,