From a273327c6a380d742a76657fa566ce34dc067919 Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Tue, 8 Oct 2013 17:41:49 +0400 Subject: [PATCH] Remove "using namespace std" from MiscUtils.h. --- library/include/MiscUtils.h | 4 +++- plugins/autolabor.cpp | 1 + plugins/automaterial.cpp | 1 + plugins/devel/autolabor2.cpp | 1 + plugins/search.cpp | 1 + plugins/steam-engine.cpp | 1 + plugins/tweak.cpp | 1 + plugins/uicommon.h | 2 +- plugins/workflow.cpp | 1 + 9 files changed, 11 insertions(+), 2 deletions(-) diff --git a/library/include/MiscUtils.h b/library/include/MiscUtils.h index f5b4e8ded..660699d7a 100644 --- a/library/include/MiscUtils.h +++ b/library/include/MiscUtils.h @@ -32,7 +32,9 @@ distribution. #include #include -using namespace std; +using std::ostream; +using std::stringstream; +using std::endl; template void print_bits ( T val, ostream& out ) diff --git a/plugins/autolabor.cpp b/plugins/autolabor.cpp index 738dc7c66..060b00a2c 100644 --- a/plugins/autolabor.cpp +++ b/plugins/autolabor.cpp @@ -44,6 +44,7 @@ using std::string; using std::endl; +using std::vector; using namespace DFHack; using namespace df::enums; using df::global::ui; diff --git a/plugins/automaterial.cpp b/plugins/automaterial.cpp index 848d02bc2..825e69b01 100644 --- a/plugins/automaterial.cpp +++ b/plugins/automaterial.cpp @@ -36,6 +36,7 @@ #include "TileTypes.h" #include "df/job_item.h" +using namespace std; using std::map; using std::string; using std::vector; diff --git a/plugins/devel/autolabor2.cpp b/plugins/devel/autolabor2.cpp index 621f41be0..ee5d9af0d 100644 --- a/plugins/devel/autolabor2.cpp +++ b/plugins/devel/autolabor2.cpp @@ -67,6 +67,7 @@ #include #include +using namespace std; using std::string; using std::endl; using namespace DFHack; diff --git a/plugins/search.cpp b/plugins/search.cpp index bb903b408..0f519414b 100644 --- a/plugins/search.cpp +++ b/plugins/search.cpp @@ -28,6 +28,7 @@ #include "df/misc_trait_type.h" #include "df/unit_misc_trait.h" +using namespace std; using std::set; using std::vector; using std::string; diff --git a/plugins/steam-engine.cpp b/plugins/steam-engine.cpp index e3cd9b529..f8aed6704 100644 --- a/plugins/steam-engine.cpp +++ b/plugins/steam-engine.cpp @@ -113,6 +113,7 @@ using std::vector; using std::string; using std::stack; +using std::set; using namespace DFHack; using namespace df::enums; diff --git a/plugins/tweak.cpp b/plugins/tweak.cpp index b9e6ea7f2..ed5c706ef 100644 --- a/plugins/tweak.cpp +++ b/plugins/tweak.cpp @@ -61,6 +61,7 @@ #include +using std::set; using std::vector; using std::string; using std::endl; diff --git a/plugins/uicommon.h b/plugins/uicommon.h index d9c225d88..47ab4d330 100644 --- a/plugins/uicommon.h +++ b/plugins/uicommon.h @@ -14,7 +14,7 @@ #include "df/enabler.h" - +using namespace std; using std::string; using std::vector; using std::map; diff --git a/plugins/workflow.cpp b/plugins/workflow.cpp index 810cc46fe..16baec260 100644 --- a/plugins/workflow.cpp +++ b/plugins/workflow.cpp @@ -45,6 +45,7 @@ using std::vector; using std::string; using std::endl; +using std::flush; using namespace DFHack; using namespace df::enums;