diff options
author | Koushik Dutta <koushd@gmail.com> | 2013-08-14 10:01:22 -0700 |
---|---|---|
committer | Koushik Dutta <koushd@gmail.com> | 2013-08-14 10:01:22 -0700 |
commit | 49a02b8c916e8ef011d9f56901d208eca626b85b (patch) | |
tree | 1148a42ede0e6661854b8f92d4bbe52a4290d02b /heimdall/source/Interface.h | |
parent | c82df274ecea32cd6528f070a21528bf80a2f466 (diff) | |
parent | f95619028fa5c80284e6ade2ced7772e41040424 (diff) | |
download | external_heimdall-49a02b8c916e8ef011d9f56901d208eca626b85b.zip external_heimdall-49a02b8c916e8ef011d9f56901d208eca626b85b.tar.gz external_heimdall-49a02b8c916e8ef011d9f56901d208eca626b85b.tar.bz2 |
Merge remote-tracking branch 'bd/master' into cm-10.2
Conflicts:
Linux/README
OSX/README.txt
heimdall-frontend/doc-pak/README
heimdall/doc-pak/README
Change-Id: Ib5867d7a2be030290a3896ab82fe48a7f0a97e63
Diffstat (limited to 'heimdall/source/Interface.h')
-rw-r--r-- | heimdall/source/Interface.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/heimdall/source/Interface.h b/heimdall/source/Interface.h index ab4b538..27d08c8 100644 --- a/heimdall/source/Interface.h +++ b/heimdall/source/Interface.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2012 Benjamin Dobell, Glass Echidna +/* Copyright (c) 2010-2013 Benjamin Dobell, Glass Echidna Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -31,9 +31,6 @@ // Heimdall #include "Heimdall.h" -using namespace std; -using namespace libpit; - namespace Heimdall { namespace Interface @@ -59,7 +56,7 @@ namespace Heimdall } ActionInfo; - const map<string, ActionInfo>& GetActionMap(void); + const std::map<std::string, ActionInfo>& GetActionMap(void); void Print(const char *format, ...); void PrintWarning(const char *format, ...); @@ -74,7 +71,7 @@ namespace Heimdall void PrintDeviceDetectionFailed(void); - void PrintPit(const PitData *pitData); + void PrintPit(const libpit::PitData *pitData); void SetStdoutErrors(bool enabled); }; |