Teach the include sorter to skip files under test trees and under INPUTS

[oota-llvm.git] / lib / Archive / ArchiveInternals.h

diff --git a/lib/Archive/ArchiveInternals.h b/lib/Archive/ArchiveInternals.h
index baea544d20b8f34ba7779bb0d5847182fc53ea18..f6c87e899f25b498c8850d4b62be5023d55ef207 100644 (file)
--- a/lib/Archive/ArchiveInternals.h
+++ b/lib/Archive/ArchiveInternals.h
@@ -14,10 +14,9 @@
 #ifndef LIB_ARCHIVE_ARCHIVEINTERNALS_H
 #define LIB_ARCHIVE_ARCHIVEINTERNALS_H
 
-#include "llvm/Bitcode/Archive.h"
-#include "llvm/System/TimeValue.h"
 #include "llvm/ADT/StringExtras.h"
-
+#include "llvm/Bitcode/Archive.h"
+#include "llvm/Support/TimeValue.h"
 #include <cstring>
 
 #define ARFILE_MAGIC "!<arch>\n"                   ///< magic string
@@ -66,7 +65,7 @@ namespace llvm {
       fmag[1] = '\n';
     }
 
-    bool checkSignature() {
+    bool checkSignature() const {
       return 0 == memcmp(fmag, ARFILE_MEMBER_MAGIC,2);
     }
   };
@@ -77,7 +76,7 @@ namespace llvm {
                           std::vector<std::string>& symbols,
                           std::string* ErrMsg);
   
-  Module* GetBitcodeSymbols(const unsigned char*Buffer,unsigned Length,
+  Module* GetBitcodeSymbols(const char *Buffer, unsigned Length,
                             const std::string& ModuleID,
                             LLVMContext& Context,
                             std::vector<std::string>& symbols,