Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

Commit

Permalink
deps: update ChakraCore to chakra-core/ChakraCore@5d83677e2c
Browse files Browse the repository at this point in the history
[MERGE #6040 @meg-gupta] Fix for SWB build break on Linux

Merge pull request #6040 from meg-gupta:fixswb

Reviewed-By: chakrabot <chakrabot@users.noreply.github.com>
  • Loading branch information
Meghana Gupta authored and chakrabot committed Mar 28, 2019
1 parent 2e14bba commit 37183ae
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ namespace Js
private:
static DeferredTypeHandler defaultInstance;

DeferredTypeInitializer m_initializer;
FieldNoBarrier(DeferredTypeInitializer) m_initializer;

bool EnsureObjectReady(DynamicObject* instance, DeferredInitializeMode mode);
virtual BOOL FreezeImpl(DynamicObject *instance, bool isConvertedType) override;
Expand Down
2 changes: 1 addition & 1 deletion deps/chakrashim/core/lib/Runtime/Types/NullTypeHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace Js

DEFINE_VTABLE_CTOR_NO_REGISTER(NullTypeHandlerBase, DynamicTypeHandler);

bool isPrototype;
FieldNoBarrier(bool) isPrototype;

public:
DEFINE_GETCPPNAME();
Expand Down

0 comments on commit 37183ae

Please sign in to comment.