Skip to content

Commit 9c1a252

Browse files
authored
Fix two compilation errors (#9041)
- Include <limits> in bitset.h - The type could not be inferred for Scene.cpp's `SharedState` line. The failure came from clang version 1:14.0-55~exp2
1 parent bf8e798 commit 9c1a252

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

filament/src/details/Scene.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,8 @@ void FScene::updateUBOs(
446446

447447
// We capture state shared between Scene and the update buffer callback, because the Scene could
448448
// be destroyed before the callback executes.
449-
std::weak_ptr<SharedState>* const weakShared = new(std::nothrow) std::weak_ptr(mSharedState);
449+
std::weak_ptr<SharedState>* const weakShared =
450+
new (std::nothrow) std::weak_ptr<SharedState>(mSharedState);
450451

451452
// update the UBO
452453
driver.resetBufferObject(renderableUbh);

libs/utils/include/utils/bitset.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
#include <algorithm> // for std::fill
2828
#include <iterator>
29+
#include <limits>
2930
#include <type_traits>
3031

3132
#if defined(__ARM_NEON)

0 commit comments

Comments
 (0)