Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes for new folly consumption #2369

Merged
merged 2 commits into from
Apr 30, 2019
Merged

fixes for new folly consumption #2369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
185e155
suppress new folly warning in msoFolly.h
ahimberg Apr 29, 2019
0be4ae7
add export for const dynamic operator[]str
ahimberg Apr 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion RNWCPP/Desktop.DLL/react-native-win32.x64.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ EXPORTS
??4dynamic@folly@@QEAAAEAU01@$$QEAU01@@Z
??4dynamic@folly@@QEAAAEAU01@AEBU01@@Z
??8dynamic@folly@@QEBA_NAEBU01@@Z
?at@dynamic@folly@@QEGBAAEBU12@V?$Range@PEBD@2@@Z
?callJSFunction@Instance@react@facebook@@UEAAX$$QEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@0$$QEAUdynamic@folly@@@Z
?CreateAsyncStorageModule@react@facebook@@YA?AV?$unique_ptr@VCxxModule@module@xplat@facebook@@U?$default_delete@VCxxModule@module@xplat@facebook@@@std@@@std@@PEB_W@Z
?createI18nModule@windows@react@@YA?AV?$unique_ptr@VCxxModule@module@xplat@facebook@@U?$default_delete@VCxxModule@module@xplat@facebook@@@std@@@std@@V?$unique_ptr@UII18nModule@windows@react@@U?$default_delete@UII18nModule@windows@react@@@std@@@4@@Z
Expand Down Expand Up @@ -165,4 +166,4 @@ YGConfigGetUseWebDefaults
YGConfigGetDefault
YGConfigSetContext
YGConfigGetContext
YGUnitToString
YGUnitToString
1 change: 1 addition & 0 deletions RNWCPP/Desktop.DLL/react-native-win32.x86.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ EXPORTS
??4dynamic@folly@@QAEAAU01@$$QAU01@@Z
??4dynamic@folly@@QAEAAU01@ABU01@@Z
??8dynamic@folly@@QBE_NABU01@@Z
?at@dynamic@folly@@QGBEABU12@V?$Range@PBD@2@@Z
?callJSFunction@Instance@react@facebook@@UAEX$$QAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@0$$QAUdynamic@folly@@@Z
?CreateAsyncStorageModule@react@facebook@@YG?AV?$unique_ptr@VCxxModule@module@xplat@facebook@@U?$default_delete@VCxxModule@module@xplat@facebook@@@std@@@std@@PB_W@Z
?createI18nModule@windows@react@@YG?AV?$unique_ptr@VCxxModule@module@xplat@facebook@@U?$default_delete@VCxxModule@module@xplat@facebook@@@std@@@std@@V?$unique_ptr@UII18nModule@windows@react@@U?$default_delete@UII18nModule@windows@react@@@std@@@4@@Z
Expand Down
77 changes: 39 additions & 38 deletions RNWCPP/Desktop/msoFolly.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,39 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

// This file is a helper to allow devmain code to include folly
// TODO: This file should eventually move to devmain
//#ifndef FBXPLATMODULE
//#define FBXPLATMODULE

#include <iostream>
#pragma warning( push )
#pragma warning( disable : 4995 )
#pragma warning( disable : 4068 )
#pragma warning( disable : 4146 )
#pragma warning( disable : 4100 )
#pragma push_macro("CHECK")
#pragma push_macro("Check")
#pragma push_macro("max")
#pragma push_macro("min")
#pragma push_macro("OUT")
#pragma push_macro("IN")
#undef Check
#undef CHECK
#undef max
#undef min
#undef OUT
#undef IN
#include <folly/dynamic.h>
#pragma pop_macro("IN")
#pragma pop_macro("OUT")
#pragma pop_macro("min")
#pragma pop_macro("max")
#pragma pop_macro("Check")
#pragma pop_macro("CHECK")
#pragma warning( pop )

//#endif


// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

// This file is a helper to allow devmain code to include folly
// TODO: This file should eventually move to devmain
//#ifndef FBXPLATMODULE
//#define FBXPLATMODULE

#include <iostream>
#pragma warning( push )
#pragma warning( disable : 4995 )
#pragma warning( disable : 4068 )
#pragma warning( disable : 4146 )
#pragma warning( disable : 4100 )
#pragma warning( disable : 4324 ) // structure was padded due to alignment specifier
#pragma push_macro("CHECK")
#pragma push_macro("Check")
#pragma push_macro("max")
#pragma push_macro("min")
#pragma push_macro("OUT")
#pragma push_macro("IN")
#undef Check
#undef CHECK
#undef max
#undef min
#undef OUT
#undef IN
#include <folly/dynamic.h>
#pragma pop_macro("IN")
#pragma pop_macro("OUT")
#pragma pop_macro("min")
#pragma pop_macro("max")
#pragma pop_macro("Check")
#pragma pop_macro("CHECK")
#pragma warning( pop )

//#endif


1 change: 1 addition & 0 deletions RNWCPP/ReactUWP/EndPoints/dll/react-native-uwp.arm.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ EXPORTS
??0ColdClass@cold_detail@folly@@QAA@XZ
?atImpl@dynamic@folly@@AGBAABU12@ABU12@@Z
??Adynamic@folly@@QGAAAAU01@V?$Range@PBD@1@@Z
?at@dynamic@folly@@QGBAABU12@V?$Range@PBD@2@@Z
??0TypeError@folly@@QAA@ABU01@@Z
??0TypeError@folly@@QAA@$$QAU01@@Z
?destroy@dynamic@folly@@AAAXXZ
Expand Down
1 change: 1 addition & 0 deletions RNWCPP/ReactUWP/EndPoints/dll/react-native-uwp.x64.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ EXPORTS
?destroy@dynamic@folly@@AEAAXXZ
??8dynamic@folly@@QEBA_NAEBU01@@Z
??Adynamic@folly@@QEGAAAEAU01@V?$Range@PEBD@1@@Z
?at@dynamic@folly@@QEGBAAEBU12@V?$Range@PEBD@2@@Z
??4dynamic@folly@@QEAAAEAU01@$$QEAU01@@Z
?hash@dynamic@folly@@QEBA_KXZ
??0TypeError@folly@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4Type@dynamic@1@@Z
Expand Down
1 change: 1 addition & 0 deletions RNWCPP/ReactUWP/EndPoints/dll/react-native-uwp.x86.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ EXPORTS
??4dynamic@folly@@QAEAAU01@$$QAU01@@Z
?atImpl@dynamic@folly@@AGBEABU12@ABU12@@Z
??Adynamic@folly@@QGAEAAU01@V?$Range@PBD@1@@Z
?at@dynamic@folly@@QGBEABU12@V?$Range@PBD@2@@Z
?destroy@dynamic@folly@@AAEXXZ
??0TypeError@folly@@QAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4Type@dynamic@1@@Z
??0TypeError@folly@@QAE@ABU01@@Z
Expand Down
5 changes: 5 additions & 0 deletions RNWCPP/Universal.SampleApp/HostingPane.xaml.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ void EnsureExportedFunctions(bool createThings)
dy.asInt();
dy.asString();
dy.asBool();
dy[0];
dy["test"];
const folly::dynamic& cdy = dy;
cdy[0];
cdy["test"];
}
}

Expand Down