[Bf-blender-cvs] [1e50ce92848] soc-2021-adaptive-cloth: bli: generational_arena: fix: compile errors
ishbosamiya
noreply at git.blender.org
Fri Jun 18 11:22:43 CEST 2021
Commit: 1e50ce92848bea68adfd0b86bef5fab8154c40c5
Author: ishbosamiya
Date: Tue Jun 15 11:40:38 2021 +0530
Branches: soc-2021-adaptive-cloth
https://developer.blender.org/rB1e50ce92848bea68adfd0b86bef5fab8154c40c5
bli: generational_arena: fix: compile errors
===================================================================
M source/blender/blenlib/BLI_generational_arena.hh
===================================================================
diff --git a/source/blender/blenlib/BLI_generational_arena.hh b/source/blender/blenlib/BLI_generational_arena.hh
index 418e0669acd..359a15c735a 100644
--- a/source/blender/blenlib/BLI_generational_arena.hh
+++ b/source/blender/blenlib/BLI_generational_arena.hh
@@ -32,8 +32,7 @@
#include "BLI_vector.hh"
-namespace blender {
-namespace generational_arena {
+namespace blender::generational_arena {
template<
/**
@@ -55,6 +54,8 @@ template<
*/
typename Allocator = GuardedAllocator>
class Arena {
+ struct EntryNoExist;
+ struct EntryExist;
/* using declarations */
using usize = uint64_t;
using isize = int64_t;
@@ -109,10 +110,8 @@ class Index {
std::tuple<usize, usize> get_raw() const
{
- return std::make_tuple(this->index, this->generation)
+ return std::make_tuple(this->index, this->generation);
}
};
-} /* namespace generational_arena */
-
-} /* namespace blender */
+} /* namespace blender::generational_arena */
More information about the Bf-blender-cvs
mailing list