Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

This commit may need to be reversed, for some of the older compilers but

Browse Source 
I'm guessing its safe.

Basically it fixes a warning about typedef usage.
Reading the docs on gcc-3.2 it says that classes that use a typedef
need to have the keyword "typename" infront of them according to the c++
standard.  Currently it only produces a warning but it may be an
error later, so I figured why not fix it.

Kent
This commit is contained in:
Kent Mein
2003-01-21 18:31:50 +00:00
parent b018475935
commit 3bdb9b7f39
1 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
intern/container/CTR_TaggedSetOps.h
View File

@@ -89,8 +89,10 @@ public :
// iterate through individual members of each vector // iterate through individual members of each vector
// mark each obejct that the index points to // mark each obejct that the index points to
std::vector< std::vector<IndexType> >::const_iterator last_vector = index_list.end(); typename std::vector< std::vector<IndexType> >::const_iterator
std::vector< std::vector<IndexType> >::const_iterator start_vector = index_list.begin(); last_vector = index_list.end();
typename std::vector< std::vector<IndexType> >::const_iterator
start_vector = index_list.begin();
// FIXME some temporary space // FIXME some temporary space
@@ -101,8 +103,10 @@ public :
for (; start_vector != last_vector; ++start_vector) { for (; start_vector != last_vector; ++start_vector) {
std::vector<IndexType>::const_iterator last_index = start_vector->end(); typename std::vector<IndexType>::const_iterator
std::vector<IndexType>::const_iterator start_index = start_vector->begin(); last_index = start_vector->end();
typename std::vector<IndexType>::const_iterator
start_index = start_vector->begin();
for (; start_index != last_index; ++start_index) { for (; start_index != last_index; ++start_index) {
@@ -123,8 +127,10 @@ public :
// now iterate through the union and pull out all those with the right tag // now iterate through the union and pull out all those with the right tag
std::vector<IndexType>::const_iterator last_index = temp_union.end(); typename std::vector<IndexType>::const_iterator last_index =
std::vector<IndexType>::const_iterator start_index = temp_union.begin(); temp_union.end();
typename std::vector<IndexType>::const_iterator start_index =
temp_union.begin();
for (; start_index != last_index; ++start_index) { for (; start_index != last_index; ++start_index) {
@@ -155,8 +161,10 @@ public :
std::vector<IndexType> &output std::vector<IndexType> &output
) { ) {
std::vector<IndexType>::const_iterator last_index = a.end(); typename std::vector<IndexType>::const_iterator last_index =
std::vector<IndexType>::const_iterator start_index = a.begin(); a.end();
typename std::vector<IndexType>::const_iterator start_index =
a.begin();
for (; start_index != last_index; ++start_index) { for (; start_index != last_index; ++start_index) {
ObjectType & prim = primitives[*start_index]; ObjectType & prim = primitives[*start_index];
@@ -194,13 +202,17 @@ public :
// iterate through individual members of each vector // iterate through individual members of each vector
// mark each obejct that the index points to // mark each obejct that the index points to
std::vector< std::vector<IndexType> >::const_iterator last_vector = index_list.end(); typename std::vector< std::vector<IndexType> >::const_iterator
std::vector< std::vector<IndexType> >::iterator start_vector = index_list.begin(); last_vector = index_list.end();
typename std::vector< std::vector<IndexType> >::iterator
start_vector = index_list.begin();
for (; start_vector != last_vector; ++start_vector) { for (; start_vector != last_vector; ++start_vector) {
std::vector<IndexType>::const_iterator last_index = start_vector->end(); typename std::vector<IndexType>::const_iterator
std::vector<IndexType>::iterator start_index = start_vector->begin(); last_index = start_vector->end();
typename std::vector<IndexType>::iterator
start_index = start_vector->begin();
for (; start_index != last_index; ++start_index) { for (; start_index != last_index; ++start_index) {
@@ -216,8 +228,10 @@ public :
// now iterate through the union and reset the tags // now iterate through the union and reset the tags
std::vector<IndexType>::const_iterator last_index = output.end(); typename std::vector<IndexType>::const_iterator last_index =
std::vector<IndexType>::iterator start_index = output.begin(); output.end();
typename std::vector<IndexType>::iterator start_index =
output.begin();
for (; start_index != last_index; ++start_index) { for (; start_index != last_index; ++start_index) {
@@ -239,8 +253,10 @@ public :
// iterate through b mark all // iterate through b mark all
// iterate through a and add to output all unmarked // iterate through a and add to output all unmarked
std::vector<IndexType>::const_iterator last_index = b.end(); typename std::vector<IndexType>::const_iterator last_index =
std::vector<IndexType>::iterator start_index = b.begin(); b.end();
typename std::vector<IndexType>::iterator start_index =
b.begin();
for (; start_index != last_index; ++start_index) { for (; start_index != last_index; ++start_index) {