KJ16609/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2026-02-22 12:00:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

libcody: Update from upstream, removing deprecated functions.

Browse Source
This commit is contained in:
Nathan Sidwell
2020-12-01 10:40:38 -08:00
parent ee1460b684
commit dfdce31c9e
3 changed files with 7 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.modules
View File

@@ -1,5 +1,8 @@
2020-12-01 Nathan Sidwell <nathan@acm.org>
libcody/
Update from upstream, removing deprecated functions.
Merge trunk 855bb43f6d0
Merge trunk eae68c434f2

36
libcody/cody.hh
View File

@@ -492,12 +492,6 @@ public:
{
return ModuleExport (str, Flags::None, ~size_t (0));
}
Packet ModuleExport
[[deprecated ("EOL:20201130, use Cody::Flag variant")]]
(char const *str, size_t len)
{
return ModuleExport (str, Flags::None, len);
}
Packet ModuleExport (std::string const &s, Flags flags = Flags::None)
{
return ModuleExport (s.c_str (), flags, s.size ());
@@ -514,12 +508,6 @@ public:
{
return ModuleImport (str, Flags::None, ~size_t (0));
}
Packet ModuleImport
[[deprecated ("EOL:20201130, use Cody::Flag variant")]]
(char const *str, size_t len)
{
return ModuleImport (str, Flags::None, len);
}
Packet ModuleImport (std::string const &s, Flags flags = Flags::None)
{
return ModuleImport (s.c_str (), flags, s.size ());
@@ -538,12 +526,6 @@ public:
{
return ModuleCompiled (str, Flags::None, ~size_t (0));
}
Packet ModuleCompiled
[[deprecated ("EOL:20201130, use Cody::Flag variant")]]
(char const *str, size_t len)
{
return ModuleCompiled (str, Flags::None, len);
}
Packet ModuleCompiled (std::string const &s, Flags flags = Flags::None)
{
return ModuleCompiled (s.c_str (), flags, s.size ());
@@ -561,12 +543,6 @@ public:
{
return IncludeTranslate (str, Flags::None, ~size_t (0));
}
Packet IncludeTranslate
[[deprecated ("EOL:20201130, use Cody::Flag variant")]]
(char const *str, size_t len)
{
return IncludeTranslate (str, Flags::None, len);
}
Packet IncludeTranslate (std::string const &s, Flags flags = Flags::None)
{
return IncludeTranslate (s.c_str (), flags, s.size ());
@@ -647,18 +623,6 @@ public:
public:
// return 0 on ok, ERRNO on failure, -1 on unspecific error
virtual int ModuleRepoRequest (Server *s);
virtual int ModuleExportRequest
[[deprecated ("EOL:20201130, use Cody::Flag variant")]]
(Server *s, std::string &module);
virtual int ModuleImportRequest
[[deprecated ("EOL:20201130, use Cody::Flag variant")]]
(Server *s, std::string &module);
virtual int ModuleCompiledRequest
[[deprecated ("EOL:20201130, use Cody::Flag variant")]]
(Server *s, std::string &module);
virtual int IncludeTranslateRequest
[[deprecated ("EOL:20201130, use Cody::Flag variant")]]
(Server *s, std::string &include);
virtual int ModuleExportRequest (Server *s, Flags flags,
std::string &module);

42
libcody/resolver.cc
View File

@@ -146,27 +146,27 @@ int Resolver::ModuleRepoRequest (Server *s)
}
// Deprecated resolver functions
int Resolver::ModuleExportRequest (Server *s, std::string &module)
int Resolver::ModuleExportRequest (Server *s, Flags, std::string &module)
{
auto cmi = GetCMIName (module);
s->PathnameResponse (cmi);
return 0;
}
int Resolver::ModuleImportRequest (Server *s, std::string &module)
int Resolver::ModuleImportRequest (Server *s, Flags, std::string &module)
{
auto cmi = GetCMIName (module);
s->PathnameResponse (cmi);
return 0;
}
int Resolver::ModuleCompiledRequest (Server *s, std::string &)
int Resolver::ModuleCompiledRequest (Server *s, Flags, std::string &)
{
s->OKResponse ();
return 0;
}
int Resolver::IncludeTranslateRequest (Server *s, std::string &include)
int Resolver::IncludeTranslateRequest (Server *s, Flags, std::string &include)
{
bool xlate = false;
@@ -201,40 +201,6 @@ int Resolver::IncludeTranslateRequest (Server *s, std::string &include)
return 0;
}
// Default behaviour is to call the deprecated entry points and ignore
// the Flags parameter, until the deprecation becomes removal
int Resolver::ModuleExportRequest (Server *s, Flags, std::string &module)
{
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
return ModuleExportRequest (s, module);
#pragma GCC diagnostic pop
}
int Resolver::ModuleImportRequest (Server *s, Flags, std::string &module)
{
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
return ModuleImportRequest (s, module);
#pragma GCC diagnostic pop
}
int Resolver::ModuleCompiledRequest (Server *s, Flags, std::string &module)
{
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
return ModuleCompiledRequest (s, module);
#pragma GCC diagnostic pop
}
int Resolver::IncludeTranslateRequest (Server *s, Flags, std::string &include)
{
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
return IncludeTranslateRequest (s, include);
#pragma GCC diagnostic pop
}
int Resolver::InvokeSubProcessRequest (Server *s, std::vector<std::string> &)
{
s->ErrorResponse ("unimplemented");