Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
spdlog
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
spdlog
Commits
d9f726f2
Unverified
Commit
d9f726f2
authored
Oct 20, 2019
by
Gabi Melman
Committed by
GitHub
Oct 20, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add global namespace qualifiers to global function calls in os-inl.h
parent
5f3521b3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
20 deletions
+20
-20
include/spdlog/details/os-inl.h
include/spdlog/details/os-inl.h
+20
-20
No files found.
include/spdlog/details/os-inl.h
View file @
d9f726f2
...
@@ -94,17 +94,17 @@ SPDLOG_INLINE std::tm localtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT
...
@@ -94,17 +94,17 @@ SPDLOG_INLINE std::tm localtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT
#ifdef _WIN32
#ifdef _WIN32
std
::
tm
tm
;
std
::
tm
tm
;
localtime_s
(
&
tm
,
&
time_tt
);
::
localtime_s
(
&
tm
,
&
time_tt
);
#else
#else
std
::
tm
tm
;
std
::
tm
tm
;
localtime_r
(
&
time_tt
,
&
tm
);
::
localtime_r
(
&
time_tt
,
&
tm
);
#endif
#endif
return
tm
;
return
tm
;
}
}
SPDLOG_INLINE
std
::
tm
localtime
()
SPDLOG_NOEXCEPT
SPDLOG_INLINE
std
::
tm
localtime
()
SPDLOG_NOEXCEPT
{
{
std
::
time_t
now_t
=
time
(
nullptr
);
std
::
time_t
now_t
=
::
time
(
nullptr
);
return
localtime
(
now_t
);
return
localtime
(
now_t
);
}
}
...
@@ -123,7 +123,7 @@ SPDLOG_INLINE std::tm gmtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT
...
@@ -123,7 +123,7 @@ SPDLOG_INLINE std::tm gmtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT
SPDLOG_INLINE
std
::
tm
gmtime
()
SPDLOG_NOEXCEPT
SPDLOG_INLINE
std
::
tm
gmtime
()
SPDLOG_NOEXCEPT
{
{
std
::
time_t
now_t
=
time
(
nullptr
);
std
::
time_t
now_t
=
::
time
(
nullptr
);
return
gmtime
(
now_t
);
return
gmtime
(
now_t
);
}
}
...
@@ -132,13 +132,13 @@ SPDLOG_INLINE void prevent_child_fd(FILE *f)
...
@@ -132,13 +132,13 @@ SPDLOG_INLINE void prevent_child_fd(FILE *f)
#ifdef _WIN32
#ifdef _WIN32
#if !defined(__cplusplus_winrt)
#if !defined(__cplusplus_winrt)
auto
file_handle
=
reinterpret_cast
<
HANDLE
>
(
_get_osfhandle
(
_fileno
(
f
)));
auto
file_handle
=
reinterpret_cast
<
HANDLE
>
(
_get_osfhandle
(
::
_fileno
(
f
)));
if
(
!::
SetHandleInformation
(
file_handle
,
HANDLE_FLAG_INHERIT
,
0
))
if
(
!::
SetHandleInformation
(
file_handle
,
HANDLE_FLAG_INHERIT
,
0
))
SPDLOG_THROW
(
spdlog_ex
(
"SetHandleInformation failed"
,
errno
));
SPDLOG_THROW
(
spdlog_ex
(
"SetHandleInformation failed"
,
errno
));
#endif
#endif
#else
#else
auto
fd
=
fileno
(
f
);
auto
fd
=
::
fileno
(
f
);
if
(
fcntl
(
fd
,
F_SETFD
,
FD_CLOEXEC
)
==
-
1
)
if
(
::
fcntl
(
fd
,
F_SETFD
,
FD_CLOEXEC
)
==
-
1
)
{
{
SPDLOG_THROW
(
spdlog_ex
(
"fcntl with FD_CLOEXEC failed"
,
errno
));
SPDLOG_THROW
(
spdlog_ex
(
"fcntl with FD_CLOEXEC failed"
,
errno
));
}
}
...
@@ -150,12 +150,12 @@ SPDLOG_INLINE bool fopen_s(FILE **fp, const filename_t &filename, const filename
...
@@ -150,12 +150,12 @@ SPDLOG_INLINE bool fopen_s(FILE **fp, const filename_t &filename, const filename
{
{
#ifdef _WIN32
#ifdef _WIN32
#ifdef SPDLOG_WCHAR_FILENAMES
#ifdef SPDLOG_WCHAR_FILENAMES
*
fp
=
_wfsopen
((
filename
.
c_str
()),
mode
.
c_str
(),
_SH_DENYNO
);
*
fp
=
::
_wfsopen
((
filename
.
c_str
()),
mode
.
c_str
(),
_SH_DENYNO
);
#else
#else
*
fp
=
_fsopen
((
filename
.
c_str
()),
mode
.
c_str
(),
_SH_DENYNO
);
*
fp
=
::
_fsopen
((
filename
.
c_str
()),
mode
.
c_str
(),
_SH_DENYNO
);
#endif
#endif
#else // unix
#else // unix
*
fp
=
fopen
((
filename
.
c_str
()),
mode
.
c_str
());
*
fp
=
::
fopen
((
filename
.
c_str
()),
mode
.
c_str
());
#endif
#endif
#ifdef SPDLOG_PREVENT_CHILD_FD
#ifdef SPDLOG_PREVENT_CHILD_FD
...
@@ -170,7 +170,7 @@ SPDLOG_INLINE bool fopen_s(FILE **fp, const filename_t &filename, const filename
...
@@ -170,7 +170,7 @@ SPDLOG_INLINE bool fopen_s(FILE **fp, const filename_t &filename, const filename
SPDLOG_INLINE
int
remove
(
const
filename_t
&
filename
)
SPDLOG_NOEXCEPT
SPDLOG_INLINE
int
remove
(
const
filename_t
&
filename
)
SPDLOG_NOEXCEPT
{
{
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
return
_wremove
(
filename
.
c_str
());
return
::
_wremove
(
filename
.
c_str
());
#else
#else
return
std
::
remove
(
filename
.
c_str
());
return
std
::
remove
(
filename
.
c_str
());
#endif
#endif
...
@@ -184,7 +184,7 @@ SPDLOG_INLINE int remove_if_exists(const filename_t &filename) SPDLOG_NOEXCEPT
...
@@ -184,7 +184,7 @@ SPDLOG_INLINE int remove_if_exists(const filename_t &filename) SPDLOG_NOEXCEPT
SPDLOG_INLINE
int
rename
(
const
filename_t
&
filename1
,
const
filename_t
&
filename2
)
SPDLOG_NOEXCEPT
SPDLOG_INLINE
int
rename
(
const
filename_t
&
filename1
,
const
filename_t
&
filename2
)
SPDLOG_NOEXCEPT
{
{
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
return
_wrename
(
filename1
.
c_str
(),
filename2
.
c_str
());
return
::
_wrename
(
filename1
.
c_str
(),
filename2
.
c_str
());
#else
#else
return
std
::
rename
(
filename1
.
c_str
(),
filename2
.
c_str
());
return
std
::
rename
(
filename1
.
c_str
(),
filename2
.
c_str
());
#endif
#endif
...
@@ -195,9 +195,9 @@ SPDLOG_INLINE bool file_exists(const filename_t &filename) SPDLOG_NOEXCEPT
...
@@ -195,9 +195,9 @@ SPDLOG_INLINE bool file_exists(const filename_t &filename) SPDLOG_NOEXCEPT
{
{
#ifdef _WIN32
#ifdef _WIN32
#ifdef SPDLOG_WCHAR_FILENAMES
#ifdef SPDLOG_WCHAR_FILENAMES
auto
attribs
=
GetFileAttributesW
(
filename
.
c_str
());
auto
attribs
=
::
GetFileAttributesW
(
filename
.
c_str
());
#else
#else
auto
attribs
=
GetFileAttributesA
(
filename
.
c_str
());
auto
attribs
=
::
GetFileAttributesA
(
filename
.
c_str
());
#endif
#endif
return
attribs
!=
INVALID_FILE_ATTRIBUTES
;
return
attribs
!=
INVALID_FILE_ATTRIBUTES
;
#else // common linux/unix all have the stat system call
#else // common linux/unix all have the stat system call
...
@@ -214,16 +214,16 @@ SPDLOG_INLINE size_t filesize(FILE *f)
...
@@ -214,16 +214,16 @@ SPDLOG_INLINE size_t filesize(FILE *f)
SPDLOG_THROW
(
spdlog_ex
(
"Failed getting file size. fd is null"
));
SPDLOG_THROW
(
spdlog_ex
(
"Failed getting file size. fd is null"
));
}
}
#if defined(_WIN32) && !defined(__CYGWIN__)
#if defined(_WIN32) && !defined(__CYGWIN__)
int
fd
=
_fileno
(
f
);
int
fd
=
::
_fileno
(
f
);
#if _WIN64 // 64 bits
#if _WIN64 // 64 bits
__int64
ret
=
_filelengthi64
(
fd
);
__int64
ret
=
::
_filelengthi64
(
fd
);
if
(
ret
>=
0
)
if
(
ret
>=
0
)
{
{
return
static_cast
<
size_t
>
(
ret
);
return
static_cast
<
size_t
>
(
ret
);
}
}
#else // windows 32 bits
#else // windows 32 bits
long
ret
=
_filelength
(
fd
);
long
ret
=
::
_filelength
(
fd
);
if
(
ret
>=
0
)
if
(
ret
>=
0
)
{
{
return
static_cast
<
size_t
>
(
ret
);
return
static_cast
<
size_t
>
(
ret
);
...
@@ -231,7 +231,7 @@ SPDLOG_INLINE size_t filesize(FILE *f)
...
@@ -231,7 +231,7 @@ SPDLOG_INLINE size_t filesize(FILE *f)
#endif
#endif
#else // unix
#else // unix
int
fd
=
fileno
(
f
);
int
fd
=
::
fileno
(
f
);
// 64 bits(but not in osx or cygwin, where fstat64 is deprecated)
// 64 bits(but not in osx or cygwin, where fstat64 is deprecated)
#if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
#if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
struct
stat64
st
;
struct
stat64
st
;
...
@@ -258,10 +258,10 @@ SPDLOG_INLINE int utc_minutes_offset(const std::tm &tm)
...
@@ -258,10 +258,10 @@ SPDLOG_INLINE int utc_minutes_offset(const std::tm &tm)
#ifdef _WIN32
#ifdef _WIN32
#if _WIN32_WINNT < _WIN32_WINNT_WS08
#if _WIN32_WINNT < _WIN32_WINNT_WS08
TIME_ZONE_INFORMATION
tzinfo
;
TIME_ZONE_INFORMATION
tzinfo
;
auto
rv
=
GetTimeZoneInformation
(
&
tzinfo
);
auto
rv
=
::
GetTimeZoneInformation
(
&
tzinfo
);
#else
#else
DYNAMIC_TIME_ZONE_INFORMATION
tzinfo
;
DYNAMIC_TIME_ZONE_INFORMATION
tzinfo
;
auto
rv
=
GetDynamicTimeZoneInformation
(
&
tzinfo
);
auto
rv
=
::
filno
GetDynamicTimeZoneInformation
(
&
tzinfo
);
#endif
#endif
if
(
rv
==
TIME_ZONE_ID_INVALID
)
if
(
rv
==
TIME_ZONE_ID_INVALID
)
SPDLOG_THROW
(
spdlog
::
spdlog_ex
(
"Failed getting timezone info. "
,
errno
));
SPDLOG_THROW
(
spdlog
::
spdlog_ex
(
"Failed getting timezone info. "
,
errno
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment