Fix for PR3946, in which SmallVector could behave strangely in corner cases.

[oota-llvm.git] / include / llvm / ADT / VectorExtras.h

diff --git a/include/llvm/ADT/VectorExtras.h b/include/llvm/ADT/VectorExtras.h
index 32778309d4eb3e229ed1a2f8bfa6e660cc36eb3b..e05f585996f9ab182dd6fa2664152692fcad05be 100644 (file)
--- a/include/llvm/ADT/VectorExtras.h
+++ b/include/llvm/ADT/VectorExtras.h
@@ -1,10 +1,10 @@
-//===-- VectorExtras.h - Helper functions for std::vector -------*- C++ -*-===//
-// 
+//===-- llvm/ADT/VectorExtras.h - Helpers for std::vector -------*- C++ -*-===//
+//
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
 //===----------------------------------------------------------------------===//
 //
 // This file contains helper functions which are useful for working with the
@@ -12,10 +12,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_VECTOREXTRAS_H
-#define SUPPORT_VECTOREXTRAS_H
+#ifndef LLVM_ADT_VECTOREXTRAS_H
+#define LLVM_ADT_VECTOREXTRAS_H
 
 #include <cstdarg>
+#include <vector>
+
+namespace llvm {
 
 /// make_vector - Helper function which is useful for building temporary vectors
 /// to pass into type construction of CallInst ctors.  This turns a null
@@ -33,4 +36,6 @@ inline std::vector<T> make_vector(T A, ...) {
   return Result;
 }
 
+} // End llvm namespace
+
 #endif