Skip to content

Commit

Permalink
Fix build failure
Browse files Browse the repository at this point in the history
  • Loading branch information
bernardnormier committed Feb 24, 2024
1 parent e84c676 commit 391d7da
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 16 deletions.
16 changes: 16 additions & 0 deletions cpp/src/Slice/SliceUtil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -520,3 +520,19 @@ Slice::checkIdentifier(const string& id)

return isValid;
}

bool
Slice::isProxyType(const TypePtr& type)
{
BuiltinPtr builtin = dynamic_pointer_cast<Builtin>(type);
if (builtin && builtin->kind() == Builtin::KindObjectProxy)
{
return true;
}

if (dynamic_pointer_cast<InterfaceDecl>(type))
{
return true;
}
return false;
}
15 changes: 1 addition & 14 deletions cpp/src/Slice/Util.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,7 @@ prependA(const std::string&);
bool
checkIdentifier(const std::string&);

inline bool isProxyType(const TypePtr& type)
{
BuiltinPtr builtin = dynamic_pointer_cast<Builtin>(type);
if (builtin && builtin->kind() == Builtin::KindObjectProxy)
{
return true;
}

if (dynamic_pointer_cast<InterfaceDecl>(type))
{
return true;
}
return false;
}
bool isProxyType(const TypePtr& type);

}
#endif
4 changes: 2 additions & 2 deletions cpp/test/IceSSL/configuration/AllTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -824,8 +824,8 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12)
test(Ice::targetEqualTo(caCert, info->certs[1]));
test(Ice::targetEqualTo(serverCert, info->certs[0]));

test(!(Ice::targetEqualTo(serverCert, info->certs[1])));
test(!(Ice::targetEqualTo(caCert, info->certs[0])));
test(!Ice::targetEqualTo(serverCert, info->certs[1]));
test(!Ice::targetEqualTo(caCert, info->certs[0]));

#if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
test(info->certs[0]->checkValidity() && info->certs[1]->checkValidity());
Expand Down

0 comments on commit 391d7da

Please sign in to comment.