Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed issue #779 #780

Closed
wants to merge 2 commits into from
Closed

Fixed issue #779 #780

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e346d4b
Fixed issue #779
gabime Jun 10, 2018
caf5347
Merge branch 'master' into master
gabime Jun 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 19 additions & 17 deletions include/fmt/core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ class basic_string_view {
FMT_CONSTEXPR basic_string_view() FMT_NOEXCEPT : data_(FMT_NULL), size_(0) {}

/** Constructs a string reference object from a C string and a size. */
FMT_CONSTEXPR basic_string_view(const Char *s, size_t size) FMT_NOEXCEPT
: data_(s), size_(size) {}
FMT_CONSTEXPR basic_string_view(const Char *s, size_t str_size) FMT_NOEXCEPT
: data_(s), size_(str_size) {}

/**
\rst
Expand Down Expand Up @@ -274,8 +274,8 @@ class basic_string_view {

// Lexicographically compare this string reference to other.
int compare(basic_string_view other) const {
size_t size = size_ < other.size_ ? size_ : other.size_;
int result = std::char_traits<Char>::compare(data_, other.data_, size);
size_t str_size = size_ < other.size_ ? size_ : other.size_;
int result = std::char_traits<Char>::compare(data_, other.data_, str_size);
if (result == 0)
result = size_ == other.size_ ? 0 : (size_ < other.size_ ? -1 : 1);
return result;
Expand Down Expand Up @@ -327,13 +327,13 @@ class basic_buffer {
std::size_t capacity_;

protected:
basic_buffer(T *p = FMT_NULL, std::size_t size = 0, std::size_t capacity = 0)
FMT_NOEXCEPT: ptr_(p), size_(size), capacity_(capacity) {}
basic_buffer(T *p = FMT_NULL, std::size_t buf_size = 0, std::size_t buf_capacity = 0)
FMT_NOEXCEPT: ptr_(p), size_(buf_size), capacity_(buf_capacity) {}

/** Sets the buffer data and capacity. */
void set(T *data, std::size_t capacity) FMT_NOEXCEPT {
ptr_ = data;
capacity_ = capacity;
void set(T *buf_data, std::size_t buf_capacity) FMT_NOEXCEPT {
ptr_ = buf_data;
capacity_ = buf_capacity;
}

/** Increases the buffer capacity to hold at least *capacity* elements. */
Expand Down Expand Up @@ -368,10 +368,12 @@ class basic_buffer {
size_ = new_size;
}

/** Reserves space to store at least *capacity* elements. */
void reserve(std::size_t capacity) {
if (capacity > capacity_)
grow(capacity);

/** Reserves space to store at least *buf_capacity* elements. */
void reserve(std::size_t buf_capacity) {
if (buf_capacity > capacity_)
grow(buf_capacity);

}

void push_back(const T &value) {
Expand Down Expand Up @@ -828,8 +830,8 @@ class context_base {
typedef basic_format_arg<Context> format_arg;

context_base(OutputIt out, basic_string_view<char_type> format_str,
basic_format_args<Context> args)
: parse_context_(format_str), out_(out), args_(args) {}
basic_format_args<Context> ctx_args)
: parse_context_(format_str), out_(out), args_(ctx_args) {}

// Returns the argument with specified index.
format_arg do_get_arg(unsigned arg_id) {
Expand Down Expand Up @@ -909,8 +911,8 @@ class basic_format_context :
stored in the object so make sure they have appropriate lifetimes.
*/
basic_format_context(OutputIt out, basic_string_view<char_type> format_str,
basic_format_args<basic_format_context> args)
: base(out, format_str, args) {}
basic_format_args<basic_format_context> ctx_args)
: base(out, format_str, ctx_args) {}

format_arg next_arg() {
return this->do_get_arg(this->parse_context().next_arg_id());
Expand Down