firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use unix or win namespaces (flutter/engine#6277)

Browse Source
This commit is contained in:
Mehmet Fidanboylu
2018-09-18 19:43:26 -07:00
committed by GitHub
parent 56fdcb7dbd
commit c43e79d938
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
engine/src/flutter/fml/unique_fd.cc
View File

@@ -11,23 +11,23 @@ namespace internal {
#if OS_WIN
namespace win {
namespace os_win {
void UniqueFDTraits::Free(HANDLE fd) {
CloseHandle(fd);
}
} // namespace win
} // namespace os_win
#else // OS_WIN
namespace unix {
namespace os_unix {
void UniqueFDTraits::Free(int fd) {
close(fd);
}
} // namespace unix
} // namespace os_unix
#endif // OS_WIN

12
engine/src/flutter/fml/unique_fd.h
View File

@@ -23,7 +23,7 @@ namespace internal {
#if OS_WIN
namespace win {
namespace os_win {
struct UniqueFDTraits {
static HANDLE InvalidValue() { return INVALID_HANDLE_VALUE; }
@@ -31,11 +31,11 @@ struct UniqueFDTraits {
static void Free(HANDLE fd);
};
} // namespace win
} // namespace os_win
#else // OS_WIN
namespace unix {
namespace os_unix {
struct UniqueFDTraits {
static int InvalidValue() { return -1; }
@@ -43,7 +43,7 @@ struct UniqueFDTraits {
static void Free(int fd);
};
} // namespace unix
} // namespace os_unix
#endif // OS_WIN
@@ -51,11 +51,11 @@ struct UniqueFDTraits {
#if OS_WIN
using UniqueFD = UniqueObject<HANDLE, internal::win::UniqueFDTraits>;
using UniqueFD = UniqueObject<HANDLE, internal::os_win::UniqueFDTraits>;
#else // OS_WIN
using UniqueFD = UniqueObject<int, internal::unix::UniqueFDTraits>;
using UniqueFD = UniqueObject<int, internal::os_unix::UniqueFDTraits>;
#endif // OS_WIN