소스 검색

AK: Make Types.h not export its functions if !USING_AK_GLOBALLY

Ali Mohammad Pur 2 년 전
부모
커밋
72514d6915
1개의 변경된 파일12개의 추가작업 그리고 4개의 파일을 삭제
  1. 12 4
      AK/Types.h

+ 12 - 4
AK/Types.h

@@ -38,7 +38,7 @@ using f128 = long double;
 #ifdef AK_OS_SERENITY
 #ifdef AK_OS_SERENITY
 
 
 using size_t = __SIZE_TYPE__;
 using size_t = __SIZE_TYPE__;
-using ssize_t = MakeSigned<size_t>;
+using ssize_t = AK::Detail::MakeSigned<size_t>;
 
 
 using ptrdiff_t = __PTRDIFF_TYPE__;
 using ptrdiff_t = __PTRDIFF_TYPE__;
 
 
@@ -67,7 +67,7 @@ using __ptrdiff_t = __PTRDIFF_TYPE__;
 #    endif
 #    endif
 
 
 #    if defined(AK_OS_WINDOWS)
 #    if defined(AK_OS_WINDOWS)
-using ssize_t = MakeSigned<size_t>;
+using ssize_t = AK::Detail::MakeSigned<size_t>;
 using mode_t = unsigned short;
 using mode_t = unsigned short;
 #    endif
 #    endif
 #endif
 #endif
@@ -85,6 +85,8 @@ namespace std { // NOLINT(cert-dcl58-cpp) nullptr_t must be in ::std:: for some
 using nullptr_t = decltype(nullptr);
 using nullptr_t = decltype(nullptr);
 }
 }
 
 
+namespace AK {
+
 using nullptr_t = std::nullptr_t;
 using nullptr_t = std::nullptr_t;
 
 
 static constexpr FlatPtr explode_byte(u8 b)
 static constexpr FlatPtr explode_byte(u8 b)
@@ -117,8 +119,6 @@ enum class [[nodiscard]] TriState : u8 {
     Unknown
     Unknown
 };
 };
 
 
-namespace AK {
-
 enum MemoryOrder {
 enum MemoryOrder {
     memory_order_relaxed = __ATOMIC_RELAXED,
     memory_order_relaxed = __ATOMIC_RELAXED,
     memory_order_consume = __ATOMIC_CONSUME,
     memory_order_consume = __ATOMIC_CONSUME,
@@ -129,3 +129,11 @@ enum MemoryOrder {
 };
 };
 
 
 }
 }
+
+#if USING_AK_GLOBALLY
+using AK::align_down_to;
+using AK::align_up_to;
+using AK::MemoryOrder;
+using AK::nullptr_t;
+using AK::TriState;
+#endif