canonicalize namespace gymnastics

llvm-svn: 81402

2 files changed, 23 insertions, 25 deletions

diff --git a/llvm/lib/MC/MCDisassembler.cpp b/llvm/lib/MC/MCDisassembler.cpp
index 29af019ec55..5d0f4c50346 100644
--- a/llvm/lib/MC/MCDisassembler.cpp
+++ b/llvm/lib/MC/MCDisassembler.cpp
@@ -8,9 +8,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/MC/MCDisassembler.h"
+using namespace llvm;
 
-llvm::MCDisassembler::MCDisassembler() {
+MCDisassembler::MCDisassembler() {
 }
   
-llvm::MCDisassembler::~MCDisassembler() {
+MCDisassembler::~MCDisassembler() {
 }
\ No newline at end of file
diff --git a/llvm/lib/Support/MemoryObject.cpp b/llvm/lib/Support/MemoryObject.cpp
index 08e5fb75b3a..91e3ecd23a2 100644
--- a/llvm/lib/Support/MemoryObject.cpp
+++ b/llvm/lib/Support/MemoryObject.cpp
@@ -1,4 +1,4 @@
-//===- MemoryObject.cpp - Abstract memory interface -------------*- C++ -*-===//
+//===- MemoryObject.cpp - Abstract memory interface -----------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -8,30 +8,27 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Support/MemoryObject.h"
-
-namespace llvm {
+using namespace llvm;
   
-  MemoryObject::~MemoryObject() {
-  }
+MemoryObject::~MemoryObject() {
+}
+
+int MemoryObject::readBytes(uint64_t address,
+                            uint64_t size,
+                            uint8_t* buf,
+                            uint64_t* copied) const {
+  uint64_t current = address;
+  uint64_t limit = getBase() + getExtent();
   
-  int MemoryObject::readBytes(uint64_t address,
-                              uint64_t size,
-                              uint8_t* buf,
-                              uint64_t* copied) const {
-    uint64_t current = address;
-    uint64_t limit = getBase() + getExtent();
-    
-    while (current - address < size && current < limit) {
-      if (readByte(current, &buf[(current - address)]))
-        return -1;
-      
-      current++;
-    }
+  while (current - address < size && current < limit) {
+    if (readByte(current, &buf[(current - address)]))
+      return -1;
     
-    if (copied)
-      *copied = current - address;
-    
-    return 0;
+    current++;
   }
-
+  
+  if (copied)
+    *copied = current - address;
+  
+  return 0;
 }