DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

rename PtrJNodeMap to PtrJNodeMapVanilla in yoga vanilla jni files

Browse Source 
Summary: Rename PtrJNodeMap in vanilla files top PtrJNodeMapVanilla , otherwise they conflict

Reviewed By: amir-shalem

Differential Revision: D17842001

fbshipit-source-id: eb164076ee2a68d79dc376826508a4143056ea31
This commit is contained in:
Sidharth Guglani
2019-10-10 05:31:30 -07:00
committed by Facebook Github Bot
parent 8aa67abdb2
commit 050893f15a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/jni/YGJNIVanilla.cpp
View File

@@ -21,7 +21,7 @@ using facebook::yoga::detail::Log;
static inline ScopedLocalRef<jobject> YGNodeJobject( static inline ScopedLocalRef<jobject> YGNodeJobject(
YGNodeRef node, YGNodeRef node,
void* layoutContext) { void* layoutContext) {
return reinterpret_cast<PtrJNodeMap*>(layoutContext) return reinterpret_cast<PtrJNodeMapVanilla*>(layoutContext)
->ref(getCurrentEnv(), node); ->ref(getCurrentEnv(), node);
} }
@@ -353,13 +353,13 @@ static void jni_YGNodeCalculateLayoutJNI(
jobjectArray javaNodes) { jobjectArray javaNodes) {
void* layoutContext = nullptr; void* layoutContext = nullptr;
auto map = PtrJNodeMap{}; auto map = PtrJNodeMapVanilla{};
if (nativePointers) { if (nativePointers) {
size_t nativePointersSize = env->GetArrayLength(nativePointers); size_t nativePointersSize = env->GetArrayLength(nativePointers);
jlong result[nativePointersSize]; jlong result[nativePointersSize];
env->GetLongArrayRegion(nativePointers, 0, nativePointersSize, result); env->GetLongArrayRegion(nativePointers, 0, nativePointersSize, result);
map = PtrJNodeMap{result, nativePointersSize, javaNodes}; map = PtrJNodeMapVanilla{result, nativePointersSize, javaNodes};
layoutContext = &map; layoutContext = &map;
} }

6
java/jni/YGJTypesVanilla.h
View File

@@ -13,13 +13,13 @@
using namespace facebook::yoga::vanillajni; using namespace facebook::yoga::vanillajni;
using namespace std; using namespace std;
class PtrJNodeMap { class PtrJNodeMapVanilla {
std::map<YGNodeRef, size_t> ptrsToIdxs_; std::map<YGNodeRef, size_t> ptrsToIdxs_;
jobjectArray javaNodes_; jobjectArray javaNodes_;
public: public:
PtrJNodeMap() : ptrsToIdxs_{}, javaNodes_{} {} PtrJNodeMapVanilla() : ptrsToIdxs_{}, javaNodes_{} {}
PtrJNodeMap( PtrJNodeMapVanilla(
jlong* nativePointers, jlong* nativePointers,
size_t nativePointersSize, size_t nativePointersSize,
jobjectArray javaNodes) jobjectArray javaNodes)