Inline variables

morzhovets · Dec 10, 2023 · 89fd2a4 · 89fd2a4
1 parent 32d8892
commit 89fd2a4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 32 deletions.
diff --git a/test/sources/LibcxxTester.cpp b/test/sources/LibcxxTester.cpp
diff --git a/test/sources/libcxx/support/Counter.h b/test/sources/libcxx/support/Counter.h
@@ -42,7 +42,7 @@ class Counter : public Counter_base
     T data_;
 };
 
-//int Counter_base::gConstructed = 0;
+inline int Counter_base::gConstructed = 0;
 
 namespace std {
 

diff --git a/test/sources/libcxx/support/DefaultOnly.h b/test/sources/libcxx/support/DefaultOnly.h
@@ -33,6 +33,6 @@ class DefaultOnly
         {return x.data_ < y.data_;}
 };
 
-//int DefaultOnly::count = 0;
+inline int DefaultOnly::count = 0;
 
 #endif // DEFAULTONLY_H
diff --git a/test/sources/libcxx/support/container_test_types.h b/test/sources/libcxx/support/container_test_types.h
@@ -287,6 +287,8 @@ struct DisableAllocationGuard {
     DisableAllocationGuard& operator=(DisableAllocationGuard const&);
 };
 
+inline bool DisableAllocationGuard::g_disable_allocations = false;
+
 //===----------------------------------------------------------------------===//
 //                       ContainerTestAllocator
 //===----------------------------------------------------------------------===//

diff --git a/test/sources/libcxx/support/min_allocator.h b/test/sources/libcxx/support/min_allocator.h
@@ -108,10 +108,10 @@ struct malloc_allocator_base {
     }
 };
 
-//size_t malloc_allocator_base::outstanding_bytes = 0;
-//size_t malloc_allocator_base::alloc_count = 0;
-//size_t malloc_allocator_base::dealloc_count = 0;
-//bool malloc_allocator_base::disable_default_constructor = false;
+inline size_t malloc_allocator_base::outstanding_bytes = 0;
+inline size_t malloc_allocator_base::alloc_count = 0;
+inline size_t malloc_allocator_base::dealloc_count = 0;
+inline bool malloc_allocator_base::disable_default_constructor = false;
 
 
 template <class T>