From 39a055645f77e0fa7bf49406635dba6bd65e361f Mon Sep 17 00:00:00 2001
From: Nathan Binkert <nate@binkert.org>
Date: Fri, 15 Apr 2011 10:44:06 -0700
Subject: includes: sort all includes

---
 src/base/loader/aout_object.cc |  2 +-
 src/base/loader/elf_object.cc  |  5 ++---
 src/base/loader/elf_object.hh  |  3 ++-
 src/base/loader/hex_file.cc    |  2 +-
 src/base/loader/object_file.cc | 18 ++++++++----------
 src/base/loader/symtab.cc      |  2 +-
 6 files changed, 15 insertions(+), 17 deletions(-)

(limited to 'src/base/loader')

diff --git a/src/base/loader/aout_object.cc b/src/base/loader/aout_object.cc
index fe435a599..31a6a2868 100644
--- a/src/base/loader/aout_object.cc
+++ b/src/base/loader/aout_object.cc
@@ -31,9 +31,9 @@
 #include <string>
 
 #include "base/loader/aout_object.hh"
+#include "base/loader/exec_aout.h"
 #include "base/loader/symtab.hh"
 #include "base/trace.hh"
-#include "base/loader/exec_aout.h"
 
 using namespace std;
 
diff --git a/src/base/loader/elf_object.cc b/src/base/loader/elf_object.cc
index a550d9765..22316c0d6 100644
--- a/src/base/loader/elf_object.cc
+++ b/src/base/loader/elf_object.cc
@@ -32,14 +32,13 @@
 #include <cassert>
 #include <string>
 
-#include "gelf.h"
-
-#include "base/bitfield.hh"
 #include "base/loader/elf_object.hh"
 #include "base/loader/symtab.hh"
+#include "base/bitfield.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"
 #include "sim/byteswap.hh"
+#include "gelf.h"
 
 using namespace std;
 
diff --git a/src/base/loader/elf_object.hh b/src/base/loader/elf_object.hh
index a19e82b28..fe75927c5 100644
--- a/src/base/loader/elf_object.hh
+++ b/src/base/loader/elf_object.hh
@@ -31,10 +31,11 @@
 #ifndef __ELF_OBJECT_HH__
 #define __ELF_OBJECT_HH__
 
-#include "base/loader/object_file.hh"
 #include <set>
 #include <vector>
 
+#include "base/loader/object_file.hh"
+
 class ElfObject : public ObjectFile
 {
   protected:
diff --git a/src/base/loader/hex_file.cc b/src/base/loader/hex_file.cc
index 61d6c8009..854834b2b 100755
--- a/src/base/loader/hex_file.cc
+++ b/src/base/loader/hex_file.cc
@@ -33,9 +33,9 @@
 #include <list>
 #include <string>
 
-#include "base/cprintf.hh"
 #include "base/loader/hex_file.hh"
 #include "base/loader/symtab.hh"
+#include "base/cprintf.hh"
 #include "mem/translating_port.hh"
 
 using namespace std;
diff --git a/src/base/loader/object_file.cc b/src/base/loader/object_file.cc
index 2273b6c4e..9dcbd7936 100644
--- a/src/base/loader/object_file.cc
+++ b/src/base/loader/object_file.cc
@@ -29,24 +29,22 @@
  *          Steve Reinhardt
  */
 
-#include <list>
-#include <string>
-
-#include <sys/types.h>
 #include <sys/mman.h>
+#include <sys/types.h>
 #include <fcntl.h>
-#include <stdio.h>
 #include <unistd.h>
 
-#include "base/cprintf.hh"
-#include "base/loader/object_file.hh"
-#include "base/loader/symtab.hh"
+#include <cstdio>
+#include <list>
+#include <string>
 
-#include "base/loader/ecoff_object.hh"
 #include "base/loader/aout_object.hh"
+#include "base/loader/ecoff_object.hh"
 #include "base/loader/elf_object.hh"
+#include "base/loader/object_file.hh"
 #include "base/loader/raw_object.hh"
-
+#include "base/loader/symtab.hh"
+#include "base/cprintf.hh"
 #include "mem/translating_port.hh"
 
 using namespace std;
diff --git a/src/base/loader/symtab.cc b/src/base/loader/symtab.cc
index 7163260ec..2c868a9b1 100644
--- a/src/base/loader/symtab.cc
+++ b/src/base/loader/symtab.cc
@@ -28,8 +28,8 @@
  * Authors: Nathan Binkert
  */
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 #include <string>
 #include <vector>
 
-- 
cgit v1.2.3