diff options
| author | Tetsuo Kiso <tetsuo-s@is.naist.jp> | 2012-05-10 02:51:05 +0400 |
|---|---|---|
| committer | Tetsuo Kiso <tetsuo-s@is.naist.jp> | 2012-05-10 02:51:05 +0400 |
| commit | 9c9d88a78a13d7bd5ad4f10b06c355519e4e41ad (patch) | |
| tree | 7961401877857cf42849916ef7aaba8258a1bc55 /mert/OptimizerFactory.h | |
| parent | aa269bdb4d82207d1381069c256745780f7cd798 (diff) | |
Avoid "using namespace std" in headers.
Diffstat (limited to 'mert/OptimizerFactory.h')
| -rw-r--r-- | mert/OptimizerFactory.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mert/OptimizerFactory.h b/mert/OptimizerFactory.h index 3d8716115..7d5e02323 100644 --- a/mert/OptimizerFactory.h +++ b/mert/OptimizerFactory.h @@ -17,7 +17,7 @@ class OptimizerFactory NOPTIMIZER }; - static std::vector<string> GetTypeNames(); + static std::vector<std::string> GetTypeNames(); // Setup optimization types. static void SetTypeNames(); @@ -27,7 +27,7 @@ class OptimizerFactory static Optimizer* BuildOptimizer(unsigned dim, const std::vector<unsigned>& to_optimize, - const std::vector<bool>& positive, + const std::vector<bool>& positive, const std::vector<parameter_t>& start, const std::string& type, unsigned int nrandom); @@ -36,7 +36,7 @@ class OptimizerFactory OptimizerFactory() {} ~OptimizerFactory() {} - static vector<string> m_type_names; + static std::vector<std::string> m_type_names; }; #endif // MERT_OPTIMIZER_FACTORY_H_ |