| 1 | diff --git a/libs/locale/src/util/gregorian.cpp b/libs/locale/src/util/gregorian.cpp
|
|---|
| 2 | index 9a99cab..580efac 100644
|
|---|
| 3 | --- a/libs/locale/src/util/gregorian.cpp
|
|---|
| 4 | +++ b/libs/locale/src/util/gregorian.cpp
|
|---|
| 5 | @@ -150,7 +150,7 @@ namespace util {
|
|---|
| 6 | gregorian_calendar(std::string const &terr)
|
|---|
| 7 | {
|
|---|
| 8 | first_day_of_week_ = first_day_of_week(terr.c_str());
|
|---|
| 9 | - time_ = time(0);
|
|---|
| 10 | + time_ = std::time(0);
|
|---|
| 11 | is_local_ = true;
|
|---|
| 12 | tzoff_ = 0;
|
|---|
| 13 | from_time(time_);
|
|---|
| 14 | @@ -237,7 +237,7 @@ namespace util {
|
|---|
| 15 | val.tm_wday = -1; // indecator of error
|
|---|
| 16 | std::time_t point = -1;
|
|---|
| 17 | if(is_local_) {
|
|---|
| 18 | - point = mktime(&val);
|
|---|
| 19 | + point = std::mktime(&val);
|
|---|
| 20 | if(point == static_cast<std::time_t>(-1)){
|
|---|
| 21 | #ifndef BOOST_WINDOWS
|
|---|
| 22 | // windows does not handle negative time_t, under other plaforms
|
|---|
| 23 | diff --git a/libs/locale/src/util/numeric.hpp b/libs/locale/src/util/numeric.hpp
|
|---|
| 24 | index ee5bb51..892427d 100644
|
|---|
| 25 | --- a/libs/locale/src/util/numeric.hpp
|
|---|
| 26 | +++ b/libs/locale/src/util/numeric.hpp
|
|---|
| 27 | @@ -130,13 +130,13 @@ private:
|
|---|
| 28 | return ret_ptr;
|
|---|
| 29 | }
|
|---|
| 30 | case flags::date:
|
|---|
| 31 | - return format_time(out,ios,fill,static_cast<time_t>(val),'x');
|
|---|
| 32 | + return format_time(out,ios,fill,static_cast<std::time_t>(val),'x');
|
|---|
| 33 | case flags::time:
|
|---|
| 34 | - return format_time(out,ios,fill,static_cast<time_t>(val),'X');
|
|---|
| 35 | + return format_time(out,ios,fill,static_cast<std::time_t>(val),'X');
|
|---|
| 36 | case flags::datetime:
|
|---|
| 37 | - return format_time(out,ios,fill,static_cast<time_t>(val),'c');
|
|---|
| 38 | + return format_time(out,ios,fill,static_cast<std::time_t>(val),'c');
|
|---|
| 39 | case flags::strftime:
|
|---|
| 40 | - return format_time(out,ios,fill,static_cast<time_t>(val),info.date_time_pattern<char_type>());
|
|---|
| 41 | + return format_time(out,ios,fill,static_cast<std::time_t>(val),info.date_time_pattern<char_type>());
|
|---|
| 42 | case flags::currency:
|
|---|
| 43 | {
|
|---|
| 44 | bool nat = info.currency_flags()==flags::currency_default
|
|---|
