diff --git a/cpp/type/define.hpp.erb b/cpp/type/define.hpp.erb
index d9d3fb1a..2eac4f4c 100644
--- a/cpp/type/define.hpp.erb
+++ b/cpp/type/define.hpp.erb
@@ -33,7 +33,7 @@ namespace msgpack {
 namespace type {
 
 
-<% GENERATION_LIMIT = 15 %>
+<% GENERATION_LIMIT = 31 %>
 template <typename A0 = void<%1.upto(GENERATION_LIMIT+1) {|i|%>, typename A<%=i%> = void<%}%>>
 struct define;
 
diff --git a/cpp/type/tuple.hpp.erb b/cpp/type/tuple.hpp.erb
index d8ddbcd6..501a0f18 100644
--- a/cpp/type/tuple.hpp.erb
+++ b/cpp/type/tuple.hpp.erb
@@ -26,7 +26,7 @@ namespace type {
 
 // FIXME operator==
 // FIXME operator!=
-<% GENERATION_LIMIT = 15 %>
+<% GENERATION_LIMIT = 31 %>
 
 template <typename A0 = void<%1.upto(GENERATION_LIMIT+1) {|i|%>, typename A<%=i%> = void<%}%>>
 struct tuple;