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

gavanx · Sep 19, 2018 · 2b25fd7 · 2b25fd7
1 parent 60c5bb8
commit 2b25fd7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/fml/unique_fd.cc b/fml/unique_fd.cc
@@ -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
 

diff --git a/fml/unique_fd.h b/fml/unique_fd.h
@@ -23,39 +23,39 @@ namespace internal {
 
 #if OS_WIN
 
-namespace win {
+namespace os_win {
 
 struct UniqueFDTraits {
   static HANDLE InvalidValue() { return INVALID_HANDLE_VALUE; }
   static bool IsValid(HANDLE value) { return value != InvalidValue(); }
   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; }
   static bool IsValid(int value) { return value >= 0; }
   static void Free(int fd);
 };
 
-}  // namespace unix
+}  // namespace os_unix
 
 #endif  // OS_WIN
 
 }  // namespace internal
 
 #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