diff options
| -rw-r--r-- | coding/file_reader_stream.hpp | 2 | ||||
| -rw-r--r-- | coding/file_writer_stream.hpp | 2 | ||||
| -rw-r--r-- | generator/classif_routine.cpp | 2 | ||||
| -rw-r--r-- | generator/data_cache_file.hpp | 2 | ||||
| -rw-r--r-- | indexer/drawing_rules.cpp | 2 | ||||
| -rw-r--r-- | indexer/drawing_rules.hpp | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/coding/file_reader_stream.hpp b/coding/file_reader_stream.hpp index 3c2341b5fa..6f2fb78dec 100644 --- a/coding/file_reader_stream.hpp +++ b/coding/file_reader_stream.hpp @@ -25,7 +25,7 @@ class FileReaderStream : public stream::ReaderStream<ReaderSource<FileReader> > ReaderSource<FileReader> m_reader; public: - FileReaderStream(char const * fName) + FileReaderStream(string const & fName) : base_type(m_reader), m_file(fName), m_reader(m_file) { } diff --git a/coding/file_writer_stream.hpp b/coding/file_writer_stream.hpp index 0ea3aa9c3c..b6d2a83522 100644 --- a/coding/file_writer_stream.hpp +++ b/coding/file_writer_stream.hpp @@ -10,7 +10,7 @@ class FileWriterStream : public stream::WriterStream<FileWriter> FileWriter m_file; public: - FileWriterStream(char const * fName) + FileWriterStream(string const & fName) : base_type(m_file), m_file(fName) {} using base_type::operator <<; diff --git a/generator/classif_routine.cpp b/generator/classif_routine.cpp index 2f62ffd2ef..db765038f9 100644 --- a/generator/classif_routine.cpp +++ b/generator/classif_routine.cpp @@ -92,7 +92,7 @@ namespace classificator for (int i = 0; i <= 17; ++i) ftype::ParseOSMTypes(inFile.c_str(), i); - drule::WriteRules(string(path + "drawing_rules.bin").c_str()); + drule::WriteRules(string(path + "drawing_rules.bin")); classif().PrintClassificator(string(path + "classificator.txt").c_str()); } diff --git a/generator/data_cache_file.hpp b/generator/data_cache_file.hpp index 74f50502e9..f3aadc773c 100644 --- a/generator/data_cache_file.hpp +++ b/generator/data_cache_file.hpp @@ -136,7 +136,7 @@ namespace cache public: DataFileBase(string const & name) - : m_stream(name.c_str()), m_offsets(name + OFFSET_EXT) + : m_stream(name), m_offsets(name + OFFSET_EXT) { } }; diff --git a/indexer/drawing_rules.cpp b/indexer/drawing_rules.cpp index b63fd2248d..ed65ccb2b1 100644 --- a/indexer/drawing_rules.cpp +++ b/indexer/drawing_rules.cpp @@ -1056,7 +1056,7 @@ void RulesHolder::Write(FileWriterStream & s) s << m_container << m_rules; } -void WriteRules(char const * fPath) +void WriteRules(string const & fPath) { FileWriterStream file(fPath); rules().Write(file); diff --git a/indexer/drawing_rules.hpp b/indexer/drawing_rules.hpp index ebab95270a..1e42ed98b3 100644 --- a/indexer/drawing_rules.hpp +++ b/indexer/drawing_rules.hpp @@ -166,7 +166,7 @@ namespace drule } }; - void WriteRules(char const * fPath); + void WriteRules(string const & fPath); void ReadRules(ReaderPtrStream & s); RulesHolder & rules(); |