diff options
author | Loo Rong Jie <loorongjie@gmail.com> | 2018-06-28 02:31:02 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-06-28 02:33:33 -0700 |
commit | 74a9f015270083d51e0e32e8390a33c3aecb9a2c (patch) | |
tree | 3d794a3187a0520675c891686f3ac75252e990f0 /src/tools/launcher | |
parent | 3dc384760a141f23ffdd098066d9e0661a20430f (diff) |
Add virtual destructor and override to BinaryLauncherBase and subclasses
Class with virtual functions must have virtual destructor. Subclasses should annotate overriden functions as `override`.
Found by Clang's `-Winconsistent-missing-override`.
Closes #5474.
PiperOrigin-RevId: 202445230
Diffstat (limited to 'src/tools/launcher')
-rw-r--r-- | src/tools/launcher/bash_launcher.h | 3 | ||||
-rw-r--r-- | src/tools/launcher/java_launcher.h | 3 | ||||
-rw-r--r-- | src/tools/launcher/launcher.h | 2 | ||||
-rw-r--r-- | src/tools/launcher/python_launcher.h | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/src/tools/launcher/bash_launcher.h b/src/tools/launcher/bash_launcher.h index 38c9d0e12b..b00828109f 100644 --- a/src/tools/launcher/bash_launcher.h +++ b/src/tools/launcher/bash_launcher.h @@ -25,7 +25,8 @@ class BashBinaryLauncher : public BinaryLauncherBase { BashBinaryLauncher(const LaunchDataParser::LaunchInfo& launch_info, int argc, wchar_t* argv[]) : BinaryLauncherBase(launch_info, argc, argv) {} - ExitCode Launch(); + ~BashBinaryLauncher() override = default; + ExitCode Launch() override; }; } // namespace launcher diff --git a/src/tools/launcher/java_launcher.h b/src/tools/launcher/java_launcher.h index d02a7165db..1881d587d9 100644 --- a/src/tools/launcher/java_launcher.h +++ b/src/tools/launcher/java_launcher.h @@ -35,7 +35,8 @@ class JavaBinaryLauncher : public BinaryLauncherBase { singlejar(false), print_javabin(false), classpath_limit(MAX_ARG_STRLEN) {} - ExitCode Launch(); + ~JavaBinaryLauncher() override = default; + ExitCode Launch() override; private: // If present, these flags should either be at the beginning of the command diff --git a/src/tools/launcher/launcher.h b/src/tools/launcher/launcher.h index 107ac17795..a5f6920b57 100644 --- a/src/tools/launcher/launcher.h +++ b/src/tools/launcher/launcher.h @@ -42,6 +42,8 @@ class BinaryLauncherBase { BinaryLauncherBase(const LaunchDataParser::LaunchInfo& launch_info, int argc, wchar_t* argv[]); + virtual ~BinaryLauncherBase() = default; + // Get launch information based on a launch info key. std::wstring GetLaunchInfoByKey(const std::string& key); diff --git a/src/tools/launcher/python_launcher.h b/src/tools/launcher/python_launcher.h index ab624da240..e0d5c547a6 100644 --- a/src/tools/launcher/python_launcher.h +++ b/src/tools/launcher/python_launcher.h @@ -25,7 +25,8 @@ class PythonBinaryLauncher : public BinaryLauncherBase { PythonBinaryLauncher(const LaunchDataParser::LaunchInfo& launch_info, int argc, wchar_t* argv[]) : BinaryLauncherBase(launch_info, argc, argv) {} - ExitCode Launch(); + ~PythonBinaryLauncher() override = default; + ExitCode Launch() override; }; } // namespace launcher |