[Bf-committers] CVS commit: blender/intern/bmfont BMF_Api.h BMF_Fonts.hBMF_Settings.h blender/intern/bmfont/intern BMF_BitmapFont.hBMF_FontData.h blender/intern/bsp/extern CSG_BooleanOps.hblender/intern/bsp/intern BSP_CSGException.h BSP_CSGHelper.h ...

[Gilles J. Seguin]

This is a multi-part message in MIME format.
--------------542EFAF9C04B127EFDB8772E
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Unprivileged User wrote:
> 
> nobody      2002/12/26 19:25:17 CET
> 
>   Modified files:
[...]
>     blender/intern/container CTR_List.h CTR_Map.h
>                              CTR_TaggedIndex.h CTR_TaggedSetOps.h
[...]
> 
>   Revision  Changes    Path

>   1.5       +1 -6      blender/intern/container/CTR_TaggedSetOps.h

make the typename explicit
--------------542EFAF9C04B127EFDB8772E
Content-Type: text/plain; charset=us-ascii;
 name="tata.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="tata.diff"

Index: blender/intern/container/CTR_TaggedSetOps.h
===================================================================
RCS file: /cvs01/blender/intern/container/CTR_TaggedSetOps.h,v
retrieving revision 1.5
diff -u -r1.5 CTR_TaggedSetOps.h
--- CTR_TaggedSetOps.h	2002/12/26 18:25:08	1.5
+++ CTR_TaggedSetOps.h	2002/12/27 05:05:11
@@ -89,8 +89,8 @@
 		// iterate through individual members of each vector
 		// mark each obejct that the index points to 
 
-		std::vector< std::vector<IndexType> >::const_iterator last_vector = index_list.end();
-		std::vector< std::vector<IndexType> >::const_iterator start_vector = index_list.begin();
+		typename std::vector< std::vector<IndexType> >::const_iterator last_vector = index_list.end();
+		typename std::vector< std::vector<IndexType> >::const_iterator start_vector = index_list.begin();
 
 		// FIXME some temporary space
 
@@ -101,8 +101,8 @@
 
 		for (; start_vector != last_vector; ++start_vector) {
 
-			std::vector<IndexType>::const_iterator last_index = start_vector->end();
-			std::vector<IndexType>::const_iterator start_index = start_vector->begin();
+			typename std::vector<IndexType>::const_iterator last_index = start_vector->end();
+			typename std::vector<IndexType>::const_iterator start_index = start_vector->begin();
 
 			for (; start_index != last_index; ++start_index) {
 
@@ -123,8 +123,8 @@
 				
 		// now iterate through the union and pull out all those with the right tag
 		
-		std::vector<IndexType>::const_iterator last_index = temp_union.end();
-		std::vector<IndexType>::const_iterator start_index = temp_union.begin();
+		typename std::vector<IndexType>::const_iterator last_index = temp_union.end();
+		typename std::vector<IndexType>::const_iterator start_index = temp_union.begin();
 
 		for (; start_index != last_index; ++start_index) {
 
@@ -155,8 +155,8 @@
 		std::vector<IndexType> &output
 	) {
 		
-		std::vector<IndexType>::const_iterator last_index = a.end();
-		std::vector<IndexType>::const_iterator start_index = a.begin();
+		typename std::vector<IndexType>::const_iterator last_index = a.end();
+		typename std::vector<IndexType>::const_iterator start_index = a.begin();
 
 		for (; start_index != last_index; ++start_index) {
 			ObjectType & prim = primitives[*start_index];
@@ -194,13 +194,13 @@
 		// iterate through individual members of each vector
 		// mark each obejct that the index points to 
 
-		std::vector< std::vector<IndexType> >::const_iterator last_vector = index_list.end();
-		std::vector< std::vector<IndexType> >::iterator start_vector = index_list.begin();
+		typename std::vector< std::vector<IndexType> >::const_iterator last_vector = index_list.end();
+		typename std::vector< std::vector<IndexType> >::iterator start_vector = index_list.begin();
 
 		for (; start_vector != last_vector; ++start_vector) {
 
-			std::vector<IndexType>::const_iterator last_index = start_vector->end();
-			std::vector<IndexType>::iterator start_index = start_vector->begin();
+			typename std::vector<IndexType>::const_iterator last_index = start_vector->end();
+			typename std::vector<IndexType>::iterator start_index = start_vector->begin();
 
 			for (; start_index != last_index; ++start_index) {
 
@@ -216,8 +216,8 @@
 				
 		// now iterate through the union and reset the tags
 		
-		std::vector<IndexType>::const_iterator last_index = output.end();
-		std::vector<IndexType>::iterator start_index = output.begin();
+		typename std::vector<IndexType>::const_iterator last_index = output.end();
+		typename std::vector<IndexType>::iterator start_index = output.begin();
 
 		for (; start_index != last_index; ++start_index) {
 
@@ -239,8 +239,8 @@
 		// iterate through b mark all
 		// iterate through a and add to output all unmarked 
 
-		std::vector<IndexType>::const_iterator last_index = b.end();
-		std::vector<IndexType>::iterator start_index = b.begin();
+		typename std::vector<IndexType>::const_iterator last_index = b.end();
+		typename std::vector<IndexType>::iterator start_index = b.begin();
 
 		for (; start_index != last_index; ++start_index) {
 

--------------542EFAF9C04B127EFDB8772E--