Skip to content

Commit

Permalink
Remove warnings in Catalyst build
Browse files Browse the repository at this point in the history
  • Loading branch information
jedelbo committed Jun 11, 2020
1 parent 00d9f63 commit f39c96f
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/realm/util/network_ssl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -874,6 +874,8 @@ int Stream::bio_destroy(BIO*) noexcept

#elif REALM_HAVE_SECURE_TRANSPORT

#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // FIXME: Should this be removed at some point?

void Context::ssl_init() {}

void Context::ssl_destroy() noexcept
Expand Down Expand Up @@ -909,7 +911,7 @@ util::CFPtr<CFArrayRef> Context::load_pem_file(const std::string& path, SecKeych
// If we don't need to import it into a keychain, try to interpret the data
// as a certificate directly. This only works for DER files, so we fall back
// to SecItemImport() on platforms which support that if this fails.
if (!keychain) {
if (keychain == nullptr) {
if (auto certificate = adoptCF(SecCertificateCreateWithData(NULL, contentsCF.get()))) {
auto ref = certificate.get();
return adoptCF(CFArrayCreate(nullptr, const_cast<const void**>(reinterpret_cast<void**>(&ref)), 1,
Expand Down

0 comments on commit f39c96f

Please sign in to comment.