From 829d2505e30dfef925aaba479119b45fd5099dd9 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Mon, 24 Jun 2013 16:47:35 -0400 Subject: [PATCH] restructured include block --- extractor.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/extractor.cpp b/extractor.cpp index 4912c9b67..3beeef510 100644 --- a/extractor.cpp +++ b/extractor.cpp @@ -18,12 +18,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or see http://www.gnu.org/licenses/agpl.txt. */ -#include -#include -#include -#include - -#include "typedefs.h" #include "Extractor/ExtractorCallbacks.h" #include "Extractor/ExtractionContainers.h" #include "Extractor/ScriptingEnvironment.h" @@ -34,6 +28,13 @@ or see http://www.gnu.org/licenses/agpl.txt. #include "Util/MachineInfo.h" #include "Util/OpenMPWrapper.h" #include "Util/StringUtil.h" +#include "typedefs.h" + +#include +#include +#include + +#include typedef BaseConfiguration ExtractorConfiguration; @@ -84,11 +85,11 @@ int main (int argc, char *argv[]) { } unsigned amountOfRAM = 1; - unsigned installedRAM = GetPhysicalmemory(); + unsigned installedRAM = GetPhysicalmemory(); if(installedRAM < 2048264) { WARN("Machine has less than 2GB RAM."); } - + StringMap stringMap; ExtractionContainers externalMemory; @@ -100,7 +101,7 @@ int main (int argc, char *argv[]) { } else { parser = new XMLParser(argv[1], extractCallBacks, scriptingEnvironment); } - + if(!parser->ReadHeader()) { ERR("Parser not initialized!"); }