Revert "Merge branch 'master' into 0.58-stable"

This reverts commit 696bd89013, reversing
changes made to a525941ab6.
This commit is contained in:
Mike Grabowski
2018-11-22 17:53:44 +01:00
parent 696bd89013
commit b864e7e63e
135 changed files with 1214 additions and 2522 deletions
+3 -3
View File
@@ -90,13 +90,13 @@ folly::Optional<ModuleConfig> ModuleRegistry::getConfig(const std::string& name)
if (it == modulesByName_.end()) {
if (unknownModules_.find(name) != unknownModules_.end()) {
return folly::none;
return nullptr;
}
if (!moduleNotFoundCallback_ ||
!moduleNotFoundCallback_(name) ||
(it = modulesByName_.find(name)) == modulesByName_.end()) {
unknownModules_.insert(name);
return folly::none;
return nullptr;
}
}
size_t index = it->second;
@@ -143,7 +143,7 @@ folly::Optional<ModuleConfig> ModuleRegistry::getConfig(const std::string& name)
if (config.size() == 2 && config[1].empty()) {
// no constants or methods
return folly::none;
return nullptr;
} else {
return ModuleConfig{index, config};
}