From a560d155d91012e4f3fa9f1742d98ac7562c0bc0 Mon Sep 17 00:00:00 2001 From: Rui Ueyama Date: Thu, 16 Jan 2014 20:30:36 +0000 Subject: [PATCH] Use static instead of anonymous namespace. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199419 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Object/COFFObjectFile.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/Object/COFFObjectFile.cpp b/lib/Object/COFFObjectFile.cpp index 007d28e6bdf..3663cd9c9a6 100644 --- a/lib/Object/COFFObjectFile.cpp +++ b/lib/Object/COFFObjectFile.cpp @@ -23,16 +23,13 @@ using namespace llvm; using namespace object; -namespace { using support::ulittle8_t; using support::ulittle16_t; using support::ulittle32_t; using support::little16_t; -} -namespace { // Returns false if size is greater than the buffer size. And sets ec. -bool checkSize(const MemoryBuffer *M, error_code &EC, uint64_t Size) { +static bool checkSize(const MemoryBuffer *M, error_code &EC, uint64_t Size) { if (M->getBufferSize() < Size) { EC = object_error::unexpected_eof; return false; @@ -43,8 +40,8 @@ bool checkSize(const MemoryBuffer *M, error_code &EC, uint64_t Size) { // Sets Obj unless any bytes in [addr, addr + size) fall outsize of m. // Returns unexpected_eof if error. template -error_code getObject(const T *&Obj, const MemoryBuffer *M, const uint8_t *Ptr, - const size_t Size = sizeof(T)) { +static error_code getObject(const T *&Obj, const MemoryBuffer *M, + const uint8_t *Ptr, const size_t Size = sizeof(T)) { uintptr_t Addr = uintptr_t(Ptr); if (Addr + Size < Addr || Addr + Size < Size || @@ -54,7 +51,6 @@ error_code getObject(const T *&Obj, const MemoryBuffer *M, const uint8_t *Ptr, Obj = reinterpret_cast(Addr); return object_error::success; } -} const coff_symbol *COFFObjectFile::toSymb(DataRefImpl Ref) const { const coff_symbol *Addr = reinterpret_cast(Ref.p); @@ -1003,4 +999,4 @@ ObjectFile *ObjectFile::createCOFFObjectFile(MemoryBuffer *Object) { error_code EC; return new COFFObjectFile(Object, EC); } -} // end namespace llvm +}