diff --git a/ChangeLog b/ChangeLog
index 3d3ed947..fc22c664 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-26  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Use class instead of typename for Triplet template parameter.
+	* src/Triplet.h
+
 2010-09-26  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Rewritten TripletGet.
diff --git a/src/Triplet.h b/src/Triplet.h
index 1b224bd9..9728f71a 100644
--- a/src/Triplet.h
+++ b/src/Triplet.h
@@ -84,20 +84,20 @@ Triplet<T1, T2, T3> makeTriplet(const T1& t1, const T2& t2, const T3& t3)
   return Triplet<T1, T2, T3>(t1, t2, t3);
 }
 
-template<typename Triplet, size_t N>
+template<class Triplet, size_t N>
 struct TripletNthType;
 
-template<typename Triplet>
+template<class Triplet>
 struct TripletNthType<Triplet, 1> {
   typedef typename Triplet::first_type type;
 };
 
-template<typename Triplet>
+template<class Triplet>
 struct TripletNthType<Triplet, 2> {
   typedef typename Triplet::second_type type;
 };
 
-template<typename Triplet>
+template<class Triplet>
 struct TripletNthType<Triplet, 3> {
   typedef typename Triplet::third_type type;
 };
@@ -135,7 +135,7 @@ struct TripletGet<3> {
 template<size_t N1, size_t N2>
 class Triplet2Pair {
 public:
-  template<typename Triplet>
+  template<class Triplet>
   std::pair<typename TripletNthType<Triplet, N1>::type,
             typename TripletNthType<Triplet, N2>::type>
   operator()(const Triplet& tri) const