Skip to content

Commit 1694a6f

Browse files
ZihanChen-MSFTmsftbot[bot]
authored andcommitted
Preparing work for adding JSI and TurboModule to ReactCommon in Microsoft/react-native-windows (#191)
* Fix include * Remove warning in x64 * Update TurboModule.cpp * Update CI loop to use node 10
1 parent 55c5835 commit 1694a6f

File tree

5 files changed

+8
-4
lines changed

5 files changed

+8
-4
lines changed

.ado/android-pr.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ jobs:
2121
submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
2222
persistCredentials: false # set to 'true' to leave the OAuth token in the Git config after the initial fetch
2323

24+
- task: UseNode@1
25+
inputs:
26+
version: '10.x'
27+
2428
- task: CmdLine@2
2529
displayName: npm install
2630
inputs:

ReactCommon/turbomodule/core/TurboCxxModule.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <vector>
1111

1212
#include <jsi/JSIDynamic.h>
13-
#include <jsireact/TurboModuleUtils.h>
13+
#include <turbomodule/core/TurboModuleUtils.h>
1414

1515
using namespace facebook;
1616
using namespace facebook::xplat::module;

ReactCommon/turbomodule/core/TurboModule.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jsi::Value TurboModule::get(jsi::Runtime& runtime, const jsi::PropNameID& propNa
2929
return jsi::Function::createFromHostFunction(
3030
runtime,
3131
propName,
32-
meta.argCount,
32+
static_cast<unsigned int>(meta.argCount),
3333
[this, meta](facebook::jsi::Runtime &rt, const facebook::jsi::Value &thisVal, const facebook::jsi::Value *args, size_t count) {
3434
return meta.invoker(rt, *this, args, count);
3535
});

ReactCommon/turbomodule/core/TurboModuleBinding.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <string>
1111

1212
#include <cxxreact/SystraceSection.h>
13-
#include <jsireact/LongLivedObject.h>
13+
#include <turbomodule/core/LongLivedObject.h>
1414

1515
using namespace facebook;
1616

ReactCommon/turbomodule/core/TurboModuleBinding.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <string>
1111

1212
#include <jsi/jsi.h>
13-
#include <jsireact/TurboModule.h>
13+
#include <turbomodule/core/TurboModule.h>
1414

1515
namespace facebook {
1616
namespace react {

0 commit comments

Comments
 (0)