Compile errors on Win32

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Compile errors on Win32

John Thompson
This seems to work:
 
Index: include/llvm/ADT/SmallVector.h
===================================================================
--- include/llvm/ADT/SmallVector.h (revision 91610)
+++ include/llvm/ADT/SmallVector.h (working copy)
@@ -495,15 +495,15 @@
    
     // Copy over the elements that we're about to overwrite.
     T *OldEnd = this->end();
-    setEnd(this->end() + NumToInsert);
+    this->setEnd(this->end() + NumToInsert);
     size_t NumOverwritten = OldEnd-I;
-    uninitialized_copy(I, OldEnd, this->end()-NumOverwritten);
+    this->uninitialized_copy(I, OldEnd, this->end()-NumOverwritten);
    
     // Replace the overwritten part.
     std::copy(From, From+NumOverwritten, I);
    
     // Insert the non-overwritten middle part.
-    uninitialized_copy(From+NumOverwritten, To, OldEnd);
+    this->uninitialized_copy(From+NumOverwritten, To, OldEnd);
     return I;
   }
  
Can somebody fix it and get the win32 build bot going again?
 
-John

--
John Thompson
[hidden email]


_______________________________________________
cfe-dev mailing list
[hidden email]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Compile errors on Win32

steve naroff
I just made the exact change and it seems to work.

When I finish building/testing, I will commit.

Thanks,

snaroff

On Dec 17, 2009, at 2:48 PM, John Thompson wrote:

This seems to work:
 
Index: include/llvm/ADT/SmallVector.h
===================================================================
--- include/llvm/ADT/SmallVector.h (revision 91610)
+++ include/llvm/ADT/SmallVector.h (working copy)
@@ -495,15 +495,15 @@
    
     // Copy over the elements that we're about to overwrite.
     T *OldEnd = this->end();
-    setEnd(this->end() + NumToInsert);
+    this->setEnd(this->end() + NumToInsert);
     size_t NumOverwritten = OldEnd-I;
-    uninitialized_copy(I, OldEnd, this->end()-NumOverwritten);
+    this->uninitialized_copy(I, OldEnd, this->end()-NumOverwritten);
    
     // Replace the overwritten part.
     std::copy(From, From+NumOverwritten, I);
    
     // Insert the non-overwritten middle part.
-    uninitialized_copy(From+NumOverwritten, To, OldEnd);
+    this->uninitialized_copy(From+NumOverwritten, To, OldEnd);
     return I;
   }
  
Can somebody fix it and get the win32 build bot going again?
 
-John

--
John Thompson
[hidden email]

_______________________________________________
cfe-dev mailing list
[hidden email]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev


_______________________________________________
cfe-dev mailing list
[hidden email]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev
Loading...