@@ -57,7 +57,7 @@ template <class T> IC bool cmp_textures_lexN(const T &lhs, const T &rhs)
5757 return std::lexicographical_compare (t1->begin (), t1->end (), t2->begin (), t2->end ());
5858}
5959
60- template <class T > void sort_tlist (xr_vector<T::template value_type *>& lst, xr_vector<T::template value_type *>& temp, T& textures)
60+ template <class T > void sort_tlist (xr_vector<typename T::value_type *>& lst, xr_vector<typename T::value_type *>& temp, T& textures)
6161{
6262 int amount = textures.begin ()->first ->size ();
6363
@@ -66,7 +66,7 @@ template <class T> void sort_tlist(xr_vector<T::template value_type *>& lst, xr_
6666 // Just sort by SSA
6767 lst.reserve (textures.size ());
6868 for (auto &i : textures) lst.push_back (&i);
69- std::sort (lst.begin (), lst.end (), cmp_second_ssa<T::template value_type *>);
69+ std::sort (lst.begin (), lst.end (), cmp_second_ssa<typename T::value_type *>);
7070 }
7171 else
7272 {
@@ -80,13 +80,13 @@ template <class T> void sort_tlist(xr_vector<T::template value_type *>& lst, xr_
8080 }
8181
8282 // 1st - part - SSA, 2nd - lexicographically
83- std::sort (lst.begin (), lst.end (), cmp_second_ssa<T::template value_type *>);
83+ std::sort (lst.begin (), lst.end (), cmp_second_ssa<typename T::value_type *>);
8484 if (2 == amount)
85- std::sort (temp.begin (), temp.end (), cmp_textures_lex2<T::template value_type *>);
85+ std::sort (temp.begin (), temp.end (), cmp_textures_lex2<typename T::value_type *>);
8686 else if (3 == amount)
87- std::sort (temp.begin (), temp.end (), cmp_textures_lex3<T::template value_type *>);
87+ std::sort (temp.begin (), temp.end (), cmp_textures_lex3<typename T::value_type *>);
8888 else
89- std::sort (temp.begin (), temp.end (), cmp_textures_lexN<T::template value_type *>);
89+ std::sort (temp.begin (), temp.end (), cmp_textures_lexN<typename T::value_type *>);
9090
9191 // merge lists
9292 lst.insert (lst.end (), temp.begin (), temp.end ());
0 commit comments