Skip to content

Commit 33dbb6c

Browse files
chiaramooneyfacebook-github-bot
authored andcommitted
Fix Make Unused Not Compiler Specific (#34357)
Summary: Use of `__attribute__` and `__unused` is compiler specific. Opt for standard `[[maybe_unused]]` instead. ## Changelog [General] [Fixed] - Remove compiler-specific syntax. Pull Request resolved: #34357 Test Plan: Built on react-native-windows. Reviewed By: cipolleschi Differential Revision: D38498481 Pulled By: javache fbshipit-source-id: af43206788f54dda3b747b6417e20096c7d520e8
1 parent 60e7eb4 commit 33dbb6c

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

React/Base/RCTModuleMethod.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ static BOOL RCTParseSelectorPart(const char **input, NSMutableString *selector)
9191
static BOOL RCTParseUnused(const char **input)
9292
{
9393
return RCTReadString(input, "__attribute__((unused))") || RCTReadString(input, "__attribute__((__unused__))") ||
94-
RCTReadString(input, "__unused");
94+
RCTReadString(input, "__unused") || RCTReadString(input, "[[maybe_unused]]");
9595
}
9696

9797
static RCTNullability RCTParseNullability(const char **input)

ReactCommon/cxxreact/JSExecutor.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,7 @@ class RN_EXPORT JSExecutor {
128128
*/
129129
virtual std::string getDescription() = 0;
130130

131-
virtual void handleMemoryPressure(__attribute__((unused)) int pressureLevel) {
132-
}
131+
virtual void handleMemoryPressure([[maybe_unused]] int pressureLevel) {}
133132

134133
virtual void destroy() {}
135134
virtual ~JSExecutor() {}

ReactCommon/cxxreact/NativeToJsBridge.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class JsToNativeBridge : public react::ExecutorDelegate {
5252
}
5353

5454
void callNativeModules(
55-
__attribute__((unused)) JSExecutor &executor,
55+
[[maybe_unused]] JSExecutor &executor,
5656
folly::dynamic &&calls,
5757
bool isEndOfBatch) override {
5858
CHECK(m_registry || calls.empty())
@@ -85,7 +85,7 @@ class JsToNativeBridge : public react::ExecutorDelegate {
8585
}
8686

8787
MethodCallResult callSerializableNativeHook(
88-
__attribute__((unused)) JSExecutor &executor,
88+
[[maybe_unused]] JSExecutor &executor,
8989
unsigned int moduleId,
9090
unsigned int methodId,
9191
folly::dynamic &&args) override {

ReactCommon/cxxreact/SampleCxxModule.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ void SampleCxxModule::save(folly::dynamic args) {
163163
sample_->save(std::move(m));
164164
}
165165

166-
void SampleCxxModule::load(__unused folly::dynamic args, Callback cb) {
166+
void SampleCxxModule::load([[maybe_unused]] folly::dynamic args, Callback cb) {
167167
dynamic d = dynamic::object;
168168
for (const auto &p : sample_->load()) {
169169
d.insert(p.first, p.second);

ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ void JSIExecutor::setBundleRegistry(std::unique_ptr<RAMBundleRegistry> r) {
173173
PropNameID::forAscii(*runtime_, "nativeRequire"),
174174
2,
175175
[this](
176-
__unused Runtime &rt,
176+
[[maybe_unused]] Runtime &rt,
177177
const facebook::jsi::Value &,
178178
const facebook::jsi::Value *args,
179179
size_t count) { return nativeRequire(args, count); }));

0 commit comments

Comments
 (0)