sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

no need for template usage for autodect_csv_flavour

Browse source
This commit is contained in:
Dane Springmeyer 2016-02-24 22:24:24 -08:00
parent f2782d0b67
commit 08d7bf2152
2 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
plugins/input/csv/csv_utils.cpp
View file

@ -33,14 +33,6 @@
#include "csv_getline.hpp"
#include "csv_utils.hpp"
#if defined(MAPNIK_MEMORY_MAPPED_FILE)
#pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp>
#include <boost/interprocess/streams/bufferstream.hpp>
#pragma GCC diagnostic pop
#endif
#include <fstream>
#include <string>
#include <cstdio>
@ -95,8 +87,7 @@ bool ignore_case_equal(std::string const& s0, std::string const& s1)
namespace detail {
template <typename T>
std::tuple<char, bool, char, char> autodect_csv_flavour(T & stream, std::size_t file_length)
std::tuple<char, bool, char, char> autodect_csv_flavour(std::istream & stream, std::size_t file_length)
{
// autodetect newlines/quotes/separators
char newline = '\n'; // default
@ -198,10 +189,6 @@ std::tuple<char, bool, char, char> autodect_csv_flavour(T & stream, std::size_t
return std::make_tuple(newline, has_newline, separator, quote);
}
template std::tuple<char, bool, char, char> autodect_csv_flavour(std::istringstream & stream, std::size_t file_length);
template std::tuple<char, bool, char, char> autodect_csv_flavour(std::ifstream & stream, std::size_t file_length);
template std::tuple<char, bool, char, char> autodect_csv_flavour(boost::interprocess::ibufferstream & stream, std::size_t file_length);
void locate_geometry_column(std::string const& header, std::size_t index, geometry_column_locator & locator)
{
std::string lower_val(header);

3
plugins/input/csv/csv_utils.hpp
View file

@ -63,8 +63,7 @@ std::size_t file_length(T & stream)
return stream.tellg();
}
template <typename T>
std::tuple<char, bool, char, char> autodect_csv_flavour(T & stream, std::size_t file_length);
std::tuple<char, bool, char, char> autodect_csv_flavour(std::istream & stream, std::size_t file_length);
void locate_geometry_column(std::string const& header, std::size_t index, geometry_column_locator & locator);
bool valid(geometry_column_locator const& locator, std::size_t max_size);