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

Jump to bottom

fix the compile error with g++4.8.5 on centos7.2 #89

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix the compile error with g++4.8.5 on centos7.2 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/tabulate/asciidoc_exporter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ SOFTWARE.
*/
#pragma once
#include <algorithm>
#if 4 < __GNUC__
#include <optional>
#endif
#include <sstream>
#include <string>
#include <tabulate/exporter.hpp>
Expand Down
14 changes: 13 additions & 1 deletion include/tabulate/table_internal.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ inline void Printer::print_table(std::ostream &stream, TableInternal &table) {
if (i + 1 == num_rows) {

// Check if there is bottom border to print:
auto bottom_border_needed{true};
bool bottom_border_needed{true};
for (size_t j = 0; j < num_columns; ++j) {
auto cell = table[i][j];
auto format = cell.format();
Expand Down Expand Up @@ -258,7 +258,11 @@ inline void Printer::print_row_in_cell(std::ostream &stream, TableInternal &tabl
auto cell = table[index.first][index.second];
auto locale = cell.locale();
auto is_multi_byte_character_support_enabled = cell.is_multi_byte_character_support_enabled();
#if 4 < __GNUC__
auto old_locale = std::locale::global(std::locale(locale));
#else
auto old_locale = std::locale::global(std::locale(locale.c_str()));
#endif
auto format = cell.format();
auto text = cell.get_text();
auto word_wrapped_text =
Expand Down Expand Up @@ -368,7 +372,11 @@ inline bool Printer::print_cell_border_top(std::ostream &stream, TableInternal &
size_t num_columns) {
auto cell = table[index.first][index.second];
auto locale = cell.locale();
#if 4 < __GNUC__
auto old_locale = std::locale::global(std::locale(locale));
#else
auto old_locale = std::locale::global(std::locale(locale.c_str()));
#endif
auto format = cell.format();
auto column_width = dimension.second;

Expand Down Expand Up @@ -411,7 +419,11 @@ inline bool Printer::print_cell_border_bottom(std::ostream &stream, TableInterna
size_t num_columns) {
auto cell = table[index.first][index.second];
auto locale = cell.locale();
#if 4 < __GNUC__
auto old_locale = std::locale::global(std::locale(locale));
#else
auto old_locale = std::locale::global(std::locale(locale.c_str()));
#endif
auto format = cell.format();
auto column_width = dimension.second;

Expand Down
4 changes: 4 additions & 0 deletions include/tabulate/utf8.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ inline int get_wcswidth(const std::string &string, const std::string &locale,

// The behavior of wcswidth() depends on the LC_CTYPE category of the current locale.
// Set the current locale based on cell properties before computing width
#if 4 < __GNUC__
auto old_locale = std::locale::global(std::locale(locale));
#else
auto old_locale = std::locale::global(std::locale(locale.c_str()));
#endif

// Convert from narrow std::string to wide string
wchar_t *wide_string = new wchar_t[string.size()];
Expand Down
22 changes: 21 additions & 1 deletion single_include/tabulate/tabulate.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6124,7 +6124,11 @@ inline int get_wcswidth(const std::string &string, const std::string &locale,

// The behavior of wcswidth() depends on the LC_CTYPE category of the current locale.
// Set the current locale based on cell properties before computing width
#if 4 < __GNUC__
auto old_locale = std::locale::global(std::locale(locale));
#else
auto old_locale = std::locale::global(std::locale(locale.c_str()));
#endif

// Convert from narrow std::string to wide string
wchar_t *wide_string = new wchar_t[string.size()];
Expand Down Expand Up @@ -7531,7 +7535,9 @@ SOFTWARE.
#include <functional>
#include <iostream>
#include <memory>
#if 4 < __GNUC__
#include <optional>
#endif
#include <string>
// #include <tabulate/cell.hpp>
// #include <tabulate/column_format.hpp>
Expand Down Expand Up @@ -8345,7 +8351,7 @@ inline void Printer::print_table(std::ostream &stream, TableInternal &table) {
if (i + 1 == num_rows) {

// Check if there is bottom border to print:
auto bottom_border_needed{true};
bool bottom_border_needed{true};
for (size_t j = 0; j < num_columns; ++j) {
auto cell = table[i][j];
auto format = cell.format();
Expand Down Expand Up @@ -8378,7 +8384,11 @@ inline void Printer::print_row_in_cell(std::ostream &stream, TableInternal &tabl
auto cell = table[index.first][index.second];
auto locale = cell.locale();
auto is_multi_byte_character_support_enabled = cell.is_multi_byte_character_support_enabled();
#if 4 < __GNUC__
auto old_locale = std::locale::global(std::locale(locale));
#else
auto old_locale = std::locale::global(std::locale(locale.c_str()));
#endif
auto format = cell.format();
auto text = cell.get_text();
auto word_wrapped_text =
Expand Down Expand Up @@ -8488,7 +8498,11 @@ inline bool Printer::print_cell_border_top(std::ostream &stream, TableInternal &
size_t num_columns) {
auto cell = table[index.first][index.second];
auto locale = cell.locale();
#if 4 < __GNUC__
auto old_locale = std::locale::global(std::locale(locale));
#else
auto old_locale = std::locale::global(std::locale(locale.c_str()));
#endif
auto format = cell.format();
auto column_width = dimension.second;

Expand Down Expand Up @@ -8531,7 +8545,11 @@ inline bool Printer::print_cell_border_bottom(std::ostream &stream, TableInterna
size_t num_columns) {
auto cell = table[index.first][index.second];
auto locale = cell.locale();
#if 4 < __GNUC__
auto old_locale = std::locale::global(std::locale(locale));
#else
auto old_locale = std::locale::global(std::locale(locale.c_str()));
#endif
auto format = cell.format();
auto column_width = dimension.second;

Expand Down Expand Up @@ -9065,7 +9083,9 @@ SOFTWARE.
*/
#pragma once
#include <algorithm>
#if 4 < __GNUC__
#include <optional>
#endif
#include <sstream>
#include <string>
// #include <tabulate/exporter.hpp>
Expand Down