Skip to content

Commit e22b95b

Browse files
Fix spurious virtual function related keywords
Remove virtual keyword from methods that are specific to this class Add comment on method that hides a non-virtual base method and remove virtual keyword from it Mark overrides with override
1 parent 3ac6d17 commit e22b95b

File tree

1 file changed

+14
-17
lines changed

1 file changed

+14
-17
lines changed

src/java_bytecode/expr2java.h

+14-17
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,27 @@ class expr2javat:public expr2ct
2020
{
2121
public:
2222
explicit expr2javat(const namespacet &_ns):expr2ct(_ns) { }
23+
2324
protected:
2425
virtual std::string convert_with_precedence(
25-
const exprt &src, unsigned &precedence);
26-
virtual std::string convert_java_this(const exprt &src, unsigned precedence);
27-
virtual std::string convert_java_instanceof(
28-
const exprt &src,
29-
unsigned precedence);
30-
virtual std::string convert_java_new(const exprt &src, unsigned precedence);
31-
virtual std::string convert_code_java_delete(
32-
const exprt &src,
33-
unsigned precedence);
34-
virtual std::string convert_struct(const exprt &src, unsigned &precedence);
35-
virtual std::string convert_code(const codet &src, unsigned indent);
26+
const exprt &src, unsigned &precedence) override;
27+
std::string convert_java_this(const exprt &src, unsigned precedence);
28+
std::string convert_java_instanceof(const exprt &src, unsigned precedence);
29+
std::string convert_java_new(const exprt &src, unsigned precedence);
30+
std::string convert_code_java_delete(const exprt &src, unsigned precedence);
31+
virtual std::string convert_struct(
32+
const exprt &src, unsigned &precedence) override;
33+
virtual std::string convert_code(const codet &src, unsigned indent) override;
3634
virtual std::string convert_constant(
37-
const constant_exprt &src,
38-
unsigned &precedence);
39-
virtual std::string convert_code_function_call(
40-
const code_function_callt &src,
41-
unsigned indent);
35+
const constant_exprt &src, unsigned &precedence) override;
36+
// Hides base class version
37+
std::string convert_code_function_call(
38+
const code_function_callt &src, unsigned indent);
4239

4340
virtual std::string convert_rec(
4441
const typet &src,
4542
const c_qualifierst &qualifiers,
46-
const std::string &declarator);
43+
const std::string &declarator) override;
4744

4845
// length of string representation of Java Char
4946
// representation is '\u0000'

0 commit comments

Comments
 (0)