Put all LLVM code into the llvm namespace, as per bug 109.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@9903 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Bytecode/Archive/ArchiveReader.cpp b/lib/Bytecode/Archive/ArchiveReader.cpp
index d155b69..33ae24b 100644
--- a/lib/Bytecode/Archive/ArchiveReader.cpp
+++ b/lib/Bytecode/Archive/ArchiveReader.cpp
@@ -22,6 +22,8 @@
#include "Config/sys/mman.h"
#include "Config/fcntl.h"
+namespace llvm {
+
namespace {
struct ar_hdr {
char name[16];
@@ -40,7 +42,6 @@
};
}
-
// getObjectType - Determine the type of object that this header represents.
// This is capable of parsing the variety of special sections used for various
// purposes.
@@ -173,3 +174,5 @@
return Result;
}
+
+} // End llvm namespace
diff --git a/lib/Bytecode/Reader/ArchiveReader.cpp b/lib/Bytecode/Reader/ArchiveReader.cpp
index d155b69..33ae24b 100644
--- a/lib/Bytecode/Reader/ArchiveReader.cpp
+++ b/lib/Bytecode/Reader/ArchiveReader.cpp
@@ -22,6 +22,8 @@
#include "Config/sys/mman.h"
#include "Config/fcntl.h"
+namespace llvm {
+
namespace {
struct ar_hdr {
char name[16];
@@ -40,7 +42,6 @@
};
}
-
// getObjectType - Determine the type of object that this header represents.
// This is capable of parsing the variety of special sections used for various
// purposes.
@@ -173,3 +174,5 @@
return Result;
}
+
+} // End llvm namespace
diff --git a/lib/Bytecode/Reader/ConstantReader.cpp b/lib/Bytecode/Reader/ConstantReader.cpp
index 00f44b3..b455354 100644
--- a/lib/Bytecode/Reader/ConstantReader.cpp
+++ b/lib/Bytecode/Reader/ConstantReader.cpp
@@ -20,6 +20,8 @@
#include "llvm/Constants.h"
#include <algorithm>
+namespace llvm {
+
const Type *BytecodeParser::parseTypeConstant(const unsigned char *&Buf,
const unsigned char *EndBuf) {
unsigned PrimType;
@@ -356,3 +358,5 @@
if (Buf > EndBuf) throw std::string("Read past end of buffer.");
}
+
+} // End llvm namespace
diff --git a/lib/Bytecode/Reader/InstructionReader.cpp b/lib/Bytecode/Reader/InstructionReader.cpp
index a409cee..ec8944e 100644
--- a/lib/Bytecode/Reader/InstructionReader.cpp
+++ b/lib/Bytecode/Reader/InstructionReader.cpp
@@ -22,6 +22,8 @@
#include "llvm/iOther.h"
#include "llvm/Module.h"
+namespace llvm {
+
namespace {
struct RawInst { // The raw fields out of the bytecode stream...
unsigned NumOperands;
@@ -33,8 +35,6 @@
};
}
-
-
RawInst::RawInst(const unsigned char *&Buf, const unsigned char *EndBuf,
std::vector<unsigned> &Args) {
unsigned Op, Typ;
@@ -389,3 +389,5 @@
BB->getInstList().push_back(Result);
BCR_TRACE(4, *Result);
}
+
+} // End llvm namespace
diff --git a/lib/Bytecode/Reader/Reader.cpp b/lib/Bytecode/Reader/Reader.cpp
index a36ea7a..9acb93d 100644
--- a/lib/Bytecode/Reader/Reader.cpp
+++ b/lib/Bytecode/Reader/Reader.cpp
@@ -32,6 +32,8 @@
#include <algorithm>
#include <memory>
+namespace llvm {
+
static inline void ALIGN32(const unsigned char *&begin,
const unsigned char *end) {
if (align32(begin, end))
@@ -693,3 +695,5 @@
throw;
}
}
+
+} // End llvm namespace
diff --git a/lib/Bytecode/Reader/ReaderInternals.h b/lib/Bytecode/Reader/ReaderInternals.h
index c890545..81ccde9 100644
--- a/lib/Bytecode/Reader/ReaderInternals.h
+++ b/lib/Bytecode/Reader/ReaderInternals.h
@@ -22,6 +22,8 @@
#include <utility>
#include <map>
+namespace llvm {
+
// Enable to trace to figure out what the heck is going on when parsing fails
//#define TRACE_LEVEL 10
//#define DEBUG_OUTPUT
@@ -226,4 +228,6 @@
#endif
}
+} // End llvm namespace
+
#endif
diff --git a/lib/Bytecode/Reader/ReaderWrappers.cpp b/lib/Bytecode/Reader/ReaderWrappers.cpp
index 0df6ea5..1cbead0 100644
--- a/lib/Bytecode/Reader/ReaderWrappers.cpp
+++ b/lib/Bytecode/Reader/ReaderWrappers.cpp
@@ -21,6 +21,8 @@
#include "Config/unistd.h"
#include "Config/sys/mman.h"
+namespace llvm {
+
//===----------------------------------------------------------------------===//
// BytecodeFileReader - Read from an mmap'able file descriptor.
//
@@ -163,7 +165,7 @@
unsigned char Buffer[4096*4];
// Read in all of the data from stdin, we cannot mmap stdin...
- while ((BlockSize = read(0 /*stdin*/, Buffer, 4096*4))) {
+ while ((BlockSize = ::read(0 /*stdin*/, Buffer, 4096*4))) {
if (BlockSize == -1)
throw std::string("Error reading from stdin!");
@@ -249,7 +251,6 @@
return MP;
}
-
//===----------------------------------------------------------------------===//
// Wrapper functions
//===----------------------------------------------------------------------===//
@@ -296,3 +297,5 @@
return 0;
}
}
+
+} // End llvm namespace
diff --git a/lib/Bytecode/Writer/ConstantWriter.cpp b/lib/Bytecode/Writer/ConstantWriter.cpp
index a9aaffe..303672d 100644
--- a/lib/Bytecode/Writer/ConstantWriter.cpp
+++ b/lib/Bytecode/Writer/ConstantWriter.cpp
@@ -17,6 +17,8 @@
#include "llvm/SymbolTable.h"
#include "llvm/DerivedTypes.h"
+namespace llvm {
+
void BytecodeWriter::outputType(const Type *T) {
output_vbr((unsigned)T->getPrimitiveID(), Out);
@@ -202,3 +204,5 @@
}
return false;
}
+
+} // End llvm namespace
diff --git a/lib/Bytecode/Writer/InstructionWriter.cpp b/lib/Bytecode/Writer/InstructionWriter.cpp
index faa576e..d52f241 100644
--- a/lib/Bytecode/Writer/InstructionWriter.cpp
+++ b/lib/Bytecode/Writer/InstructionWriter.cpp
@@ -19,6 +19,8 @@
#include "Support/Statistic.h"
#include <algorithm>
+namespace llvm {
+
static Statistic<>
NumInstrs("bytecodewriter", "Number of instructions");
@@ -295,3 +297,5 @@
// operands or a large operand index that we are referring to.
outputInstructionFormat0(&I, Opcode, Table, Type, Out);
}
+
+} // End llvm namespace
diff --git a/lib/Bytecode/Writer/SlotCalculator.cpp b/lib/Bytecode/Writer/SlotCalculator.cpp
index aef7176..c6e44e8 100644
--- a/lib/Bytecode/Writer/SlotCalculator.cpp
+++ b/lib/Bytecode/Writer/SlotCalculator.cpp
@@ -27,6 +27,8 @@
#include "Support/STLExtras.h"
#include <algorithm>
+namespace llvm {
+
#if 0
#define SC_DEBUG(X) std::cerr << X
#else
@@ -361,3 +363,5 @@
SC_DEBUG("]\n");
return (int)DestSlot;
}
+
+} // End llvm namespace
diff --git a/lib/Bytecode/Writer/SlotCalculator.h b/lib/Bytecode/Writer/SlotCalculator.h
index 7e56de9..596f932 100644
--- a/lib/Bytecode/Writer/SlotCalculator.h
+++ b/lib/Bytecode/Writer/SlotCalculator.h
@@ -22,6 +22,9 @@
#include <vector>
#include <map>
+
+namespace llvm {
+
class Value;
class Module;
class Function;
@@ -92,4 +95,6 @@
void processSymbolTableConstants(const SymbolTable *ST);
};
+} // End llvm namespace
+
#endif
diff --git a/lib/Bytecode/Writer/Writer.cpp b/lib/Bytecode/Writer/Writer.cpp
index 9381e35..9c9e1ab 100644
--- a/lib/Bytecode/Writer/Writer.cpp
+++ b/lib/Bytecode/Writer/Writer.cpp
@@ -36,6 +36,8 @@
#include "Config/string.h"
#include <algorithm>
+namespace llvm {
+
static RegisterPass<WriteBytecodePass> X("emitbytecode", "Bytecode Writer");
static Statistic<>
@@ -304,3 +306,5 @@
Out.flush();
}
+
+} // End llvm namespace
diff --git a/lib/Bytecode/Writer/WriterInternals.h b/lib/Bytecode/Writer/WriterInternals.h
index 5564f42..8cb4bfd 100644
--- a/lib/Bytecode/Writer/WriterInternals.h
+++ b/lib/Bytecode/Writer/WriterInternals.h
@@ -25,6 +25,8 @@
#include "llvm/SlotCalculator.h"
#include "llvm/Instruction.h"
+namespace llvm {
+
class BytecodeWriter {
std::deque<unsigned char> &Out;
SlotCalculator Table;
@@ -79,5 +81,6 @@
}
};
+} // End llvm namespace
#endif