diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-04-30 19:10:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-30 19:10:47 +0200 |
| commit | 4a5270d629298e546edc8a8cdf11cd9dca525d44 (patch) | |
| tree | 287ef79750fdc6c8e4904ecdf8b68f7ff900afda | |
| parent | 61cf0ceadf1e061910d002ae3d3d6b4aa01099b4 (diff) | |
| parent | f968d5916066fad70d5fa8c6c30b5d9a7e573a8d (diff) | |
| download | ATCD-4a5270d629298e546edc8a8cdf11cd9dca525d44.tar.gz | |
Merge pull request #1495 from jwillemsen/jwi-hashoverride
Mark also the generated hash operation with override
| -rw-r--r-- | TAO/TAO_IDL/be/be_interface.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 25cfe3a1559..87b89971113 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -1942,7 +1942,7 @@ be_interface::gen_perfect_hash_class_definition (const char *flat_name) << ": public TAO_Perfect_Hash_OpTable" << be_uidt_nl << "{" << be_nl << "private:" << be_idt_nl - << "unsigned int hash (const char *str, unsigned int len);" + << "unsigned int hash (const char *str, unsigned int len) override;" << be_uidt_nl << be_nl << "public:" << be_idt_nl << "const TAO_operation_db_entry * lookup " diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h index b89d8f511ea..60979b541f7 100644 --- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h +++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h @@ -59,7 +59,6 @@ public: private: // = Methods that should defined by the subclasses. GPERF program // will generate these routines. - virtual unsigned int hash (const char *str, unsigned int len) = 0; virtual const TAO_operation_db_entry* lookup (const char *str, |