Revert "fixing line endings"

This reverts commit dc75469e78.
This commit is contained in:
Dennis Luxen
2014-08-15 18:53:00 +02:00
parent dc75469e78
commit 5efa9664db
131 changed files with 0 additions and 21457 deletions
-61
View File
@@ -1,61 +0,0 @@
#ifndef OSMIUM_UTIL_OPERATORS_HPP
#define OSMIUM_UTIL_OPERATORS_HPP
/*
This file is part of Osmium (http://osmcode.org/libosmium).
Copyright 2014 Jochen Topf <jochen@topf.org> and others (see README).
Boost Software License - Version 1.0 - August 17th, 2003
Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
execute, and transmit the Software, and to prepare derivative works of the
Software, and to permit third-parties to whom the Software is furnished to
do so, all subject to the following:
The copyright notices in the Software and this entire statement, including
the above license grant, this restriction and the following disclaimer,
must be included in all copies of the Software, in whole or in part, and
all derivative works of the Software, unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
namespace osmium {
template <class T>
struct totally_ordered {
friend bool operator!=(const T& lhs, const T& rhs) {
return ! (lhs == rhs);
}
friend bool operator>(const T& lhs, const T& rhs) {
return rhs < lhs;
}
friend bool operator<=(const T& lhs, const T& rhs) {
return ! (rhs < lhs);
}
friend bool operator>=(const T& lhs, const T& rhs) {
return ! (lhs < rhs);
}
}; // struct totally_ordered
} // namespace osmium
#endif // OSMIUM_UTIL_OPERATORS_HPP
-155
View File
@@ -1,155 +0,0 @@
#ifndef OSMIUM_UTIL_OPTIONS_HPP
#define OSMIUM_UTIL_OPTIONS_HPP
/*
This file is part of Osmium (http://osmcode.org/libosmium).
Copyright 2013,2014 Jochen Topf <jochen@topf.org> and others (see README).
Boost Software License - Version 1.0 - August 17th, 2003
Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
execute, and transmit the Software, and to prepare derivative works of the
Software, and to permit third-parties to whom the Software is furnished to
do so, all subject to the following:
The copyright notices in the Software and this entire statement, including
the above license grant, this restriction and the following disclaimer,
must be included in all copies of the Software, in whole or in part, and
all derivative works of the Software, unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
#include <initializer_list>
#include <map>
#include <string>
#include <utility>
namespace osmium {
namespace util {
/**
* Stores key=value type options. This class can be used stand-alone or
* as a base class. Options are stored and retrieved by key using the
* different set() and get() methods.
*
* You can iterate over all set options. Dereferencing an iterator
* yields a std::pair of the key and value strings.
*/
class Options {
typedef std::map<std::string, std::string> option_map;
option_map m_options;
public:
typedef option_map::iterator iterator;
typedef option_map::const_iterator const_iterator;
typedef option_map::value_type value_type;
Options() = default;
explicit Options(std::initializer_list<value_type> values) :
m_options(values) {
}
Options(const Options&) = default;
Options& operator=(const Options&) = default;
Options(Options&&) = default;
Options& operator=(Options&&) = default;
~Options() = default;
void set(const std::string& key, const std::string& value) {
m_options[key] = value;
}
void set(const std::string& key, const char* value) {
m_options[key] = value;
}
void set(const std::string& key, bool value) {
m_options[key] = value ? "true" : "false";
}
void set(std::string data) {
size_t pos = data.find_first_of('=');
if (pos == std::string::npos) {
m_options[data] = "true";
} else {
std::string value = data.substr(pos+1);
data.erase(pos);
set(data, value);
}
}
/**
* Get value of "key" option. If not set the default_value (or
* empty string) is returned.
*/
std::string get(const std::string& key, const std::string& default_value="") const noexcept {
auto it = m_options.find(key);
if (it == m_options.end()) {
return default_value;
}
return it->second;
}
/**
* Is this option set to a true value ("true" or "yes")?
*/
bool is_true(const std::string& key) const noexcept {
std::string value = get(key);
return (value == "true" || value == "yes");
}
size_t size() const noexcept {
return m_options.size();
}
iterator begin() noexcept {
return m_options.begin();
}
iterator end() noexcept {
return m_options.end();
}
const_iterator begin() const noexcept {
return m_options.cbegin();
}
const_iterator end() const noexcept {
return m_options.cend();
}
const_iterator cbegin() const noexcept {
return m_options.cbegin();
}
const_iterator cend() const noexcept {
return m_options.cend();
}
}; // class Options
} // namespace util
} // namespace osmium
#endif // OSMIUM_UTIL_OPTIONS_HPP
-139
View File
@@ -1,139 +0,0 @@
#ifndef OSMIUM_UTIL_VERBOSE_OUTPUT_HPP
#define OSMIUM_UTIL_VERBOSE_OUTPUT_HPP
/*
This file is part of Osmium (http://osmcode.org/libosmium).
Copyright 2013,2014 Jochen Topf <jochen@topf.org> and others (see README).
Boost Software License - Version 1.0 - August 17th, 2003
Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
execute, and transmit the Software, and to prepare derivative works of the
Software, and to permit third-parties to whom the Software is furnished to
do so, all subject to the following:
The copyright notices in the Software and this entire statement, including
the above license grant, this restriction and the following disclaimer,
must be included in all copies of the Software, in whole or in part, and
all derivative works of the Software, unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
#include <time.h>
#include <iomanip>
#include <iostream>
#include <sstream>
namespace osmium {
/**
* @brief Helpful utility classes and functions not strictly OSM related
*/
namespace util {
/**
* Osmium programs often run for a long time because of the amount of
* OSM data processed. This class helps with keeping the user up to
* date by offering an easy way for programs to optionally output
* verbose information about what's going on.
*
* Use an object of this class instead of std::cerr as an output
* stream. Nothing is actually written if the object is not set to
* verbose mode. If it is set to verbose mode, each line is prepended
* with the running time, ie the time since the VerboseOutput object
* was created.
*/
class VerboseOutput {
/// all time output will be relative to this start time
time_t m_start;
/// is verbose mode enabled?
bool m_verbose;
/// a newline was written, start next output with runtime
bool m_newline;
/**
* If we remember that a newline was written as the last thing
* write out the time elapsed and reset the newline flag.
*/
void start_line() {
if (m_newline) {
time_t elapsed = runtime();
char old_fill = std::cerr.fill();
std::cerr << '[' << std::setw(2) << (elapsed / 60) << ':' << std::setw(2) << std::setfill('0') << (elapsed % 60) << "] ";
std::cerr.fill(old_fill);
m_newline = false;
}
}
public:
explicit VerboseOutput(bool verbose=false) :
m_start(time(NULL)),
m_verbose(verbose),
m_newline(true) {
}
~VerboseOutput() = default;
VerboseOutput(const VerboseOutput&) = default;
VerboseOutput& operator=(const VerboseOutput&) = default;
VerboseOutput(VerboseOutput&&) = default;
VerboseOutput& operator=(VerboseOutput&&) = default;
time_t runtime() const noexcept {
return time(NULL) - m_start;
}
/// Get "verbose" setting.
bool verbose() const noexcept {
return m_verbose;
}
/// Set "verbose" setting.
void verbose(bool verbose) noexcept {
m_verbose = verbose;
}
template<typename T>
friend VerboseOutput& operator<<(VerboseOutput& verbose_output, const T& value) {
if (verbose_output.m_verbose) {
verbose_output.start_line();
std::cerr << value;
// check if there was a newline a the end and remember that
std::ostringstream output_buffer;
output_buffer << value;
if (!output_buffer.str().empty() && output_buffer.str().back() == '\n') {
verbose_output.m_newline = true;
}
}
return verbose_output;
}
}; // class VerboseOutput
} // namespace util
} // namespace osmium
#endif // OSMIUM_UTIL_VERBOSE_OUTPUT_HPP