max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-22 14:06:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10552 from obsidiansystems/tiny-cpp-style-cleanup

Browse source 
`file-descriptor.hh`: Avoid some C-isms for better C++-isms
This commit is contained in:
Eelco Dolstra 2024-04-18 10:25:33 +02:00 committed by GitHub
commit 731c389d32
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libutil/file-descriptor.hh
View file

@ -17,13 +17,13 @@ struct Source;
/** /**
* Operating System capability * Operating System capability
*/ */
typedef using Descriptor =
#if _WIN32 #if _WIN32
HANDLE HANDLE
#else #else
int int
#endif #endif
Descriptor; ;
const Descriptor INVALID_DESCRIPTOR = const Descriptor INVALID_DESCRIPTOR =
#if _WIN32 #if _WIN32
@ -41,7 +41,7 @@ const Descriptor INVALID_DESCRIPTOR =
static inline Descriptor toDescriptor(int fd) static inline Descriptor toDescriptor(int fd)
{ {
#ifdef _WIN32 #ifdef _WIN32
return (HANDLE) _get_osfhandle(fd); return reinterpret_cast<HANDLE>(_get_osfhandle(fd));
#else #else
return fd; return fd;
#endif #endif
@ -56,7 +56,7 @@ static inline Descriptor toDescriptor(int fd)
static inline int fromDescriptorReadOnly(Descriptor fd) static inline int fromDescriptorReadOnly(Descriptor fd)
{ {
#ifdef _WIN32 #ifdef _WIN32
return _open_osfhandle((intptr_t) fd, _O_RDONLY); return _open_osfhandle(reinterpret_cast<intptr_t>(fd), _O_RDONLY);
#else #else
return fd; return fd;
#endif #endif