[Lldb-commits] [lldb] r233123 - Fix some -Winconsistent-missing-override warnings (& some particularly weird indenting)
David Blaikie
dblaikie at gmail.com
Tue Mar 24 15:10:47 PDT 2015
Author: dblaikie
Date: Tue Mar 24 17:10:47 2015
New Revision: 233123
URL: http://llvm.org/viewvc/llvm-project?rev=233123&view=rev
Log:
Fix some -Winconsistent-missing-override warnings (& some particularly weird indenting)
Modified:
lldb/trunk/include/lldb/Expression/ClangASTSource.h
lldb/trunk/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.h
lldb/trunk/source/Plugins/Platform/Windows/PlatformWindows.h
Modified: lldb/trunk/include/lldb/Expression/ClangASTSource.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangASTSource.h?rev=233123&r1=233122&r2=233123&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ClangASTSource.h (original)
+++ lldb/trunk/include/lldb/Expression/ClangASTSource.h Tue Mar 24 17:10:47 2015
@@ -46,7 +46,7 @@ public:
/// @param[in] declMap
/// A reference to the LLDB object that handles entity lookup.
//------------------------------------------------------------------
- ClangASTSource (const lldb::TargetSP &target) :
+ ClangASTSource (const lldb::TargetSP &target) :
m_import_in_progress (false),
m_lookups_enabled (false),
m_target (target),
@@ -55,30 +55,30 @@ public:
{
m_ast_importer = m_target->GetClangASTImporter();
}
-
+
//------------------------------------------------------------------
/// Destructor
//------------------------------------------------------------------
- ~ClangASTSource();
-
+ ~ClangASTSource();
+
//------------------------------------------------------------------
/// Interface stubs.
//------------------------------------------------------------------
- clang::Decl *GetExternalDecl (uint32_t) { return NULL; }
- clang::Stmt *GetExternalDeclStmt (uint64_t) { return NULL; }
- clang::Selector GetExternalSelector (uint32_t) { return clang::Selector(); }
- uint32_t GetNumExternalSelectors () { return 0; }
- clang::CXXBaseSpecifier *GetExternalCXXBaseSpecifiers (uint64_t Offset)
+ clang::Decl *GetExternalDecl (uint32_t) override { return NULL; }
+ clang::Stmt *GetExternalDeclStmt (uint64_t) override { return NULL; }
+ clang::Selector GetExternalSelector (uint32_t) override { return clang::Selector(); }
+ uint32_t GetNumExternalSelectors () override { return 0; }
+ clang::CXXBaseSpecifier *GetExternalCXXBaseSpecifiers (uint64_t Offset) override
{ return NULL; }
void MaterializeVisibleDecls (const clang::DeclContext *DC)
{ return; }
-
+
void InstallASTContext (clang::ASTContext *ast_context)
{
m_ast_context = ast_context;
m_ast_importer->InstallMapCompleter(ast_context, *this);
}
-
+
//
// APIs for ExternalASTSource
//
@@ -402,7 +402,7 @@ protected:
bool m_lookups_enabled;
const lldb::TargetSP m_target; ///< The target to use in finding variables and types.
- clang::ASTContext *m_ast_context; ///< The AST context requests are coming in for.
+ clang::ASTContext *m_ast_context; ///< The AST context requests are coming in for.
ClangASTImporter *m_ast_importer; ///< The target's AST importer.
std::set<const char *> m_active_lookups;
};
Modified: lldb/trunk/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.h?rev=233123&r1=233122&r2=233123&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.h (original)
+++ lldb/trunk/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.h Tue Mar 24 17:10:47 2015
@@ -50,20 +50,20 @@ public:
//------------------------------------------------------------
// lldb_private::PluginInterface functions
//------------------------------------------------------------
- virtual lldb_private::ConstString
- GetPluginName()
+ lldb_private::ConstString
+ GetPluginName() override
{
return GetPluginNameStatic (IsHost());
}
- virtual uint32_t
- GetPluginVersion()
+ uint32_t
+ GetPluginVersion() override
{
return 1;
}
- virtual const char *
- GetDescription ()
+ const char *
+ GetDescription () override
{
return GetDescriptionStatic(IsHost());
}
@@ -71,84 +71,84 @@ public:
//------------------------------------------------------------
// lldb_private::Platform functions
//------------------------------------------------------------
- virtual bool
+ bool
GetModuleSpec (const lldb_private::FileSpec& module_file_spec,
const lldb_private::ArchSpec& arch,
- lldb_private::ModuleSpec &module_spec);
+ lldb_private::ModuleSpec &module_spec) override;
- virtual lldb_private::Error
+ lldb_private::Error
RunShellCommand (const char *command,
const char *working_dir,
int *status_ptr,
int *signo_ptr,
std::string *command_output,
- uint32_t timeout_sec);
+ uint32_t timeout_sec) override;
- virtual lldb_private::Error
+ lldb_private::Error
ResolveExecutable (const lldb_private::ModuleSpec &module_spec,
lldb::ModuleSP &module_sp,
- const lldb_private::FileSpecList *module_search_paths_ptr);
+ const lldb_private::FileSpecList *module_search_paths_ptr) override;
- virtual size_t
+ size_t
GetSoftwareBreakpointTrapOpcode (lldb_private::Target &target,
- lldb_private::BreakpointSite *bp_site);
+ lldb_private::BreakpointSite *bp_site) override;
- virtual bool
- GetRemoteOSVersion ();
+ bool
+ GetRemoteOSVersion () override;
- virtual bool
- GetRemoteOSBuildString (std::string &s);
+ bool
+ GetRemoteOSBuildString (std::string &s) override;
- virtual bool
- GetRemoteOSKernelDescription (std::string &s);
+ bool
+ GetRemoteOSKernelDescription (std::string &s) override;
// Remote Platform subclasses need to override this function
- virtual lldb_private::ArchSpec
- GetRemoteSystemArchitecture ();
+ lldb_private::ArchSpec
+ GetRemoteSystemArchitecture () override;
- virtual bool
- IsConnected () const;
+ bool
+ IsConnected () const override;
- virtual lldb_private::Error
- ConnectRemote (lldb_private::Args& args);
+ lldb_private::Error
+ ConnectRemote (lldb_private::Args& args) override;
- virtual lldb_private::Error
- DisconnectRemote ();
+ lldb_private::Error
+ DisconnectRemote () override;
- virtual const char *
- GetHostname ();
+ const char *
+ GetHostname () override;
- virtual const char *
- GetUserName (uint32_t uid);
+ const char *
+ GetUserName (uint32_t uid) override;
- virtual const char *
- GetGroupName (uint32_t gid);
+ const char *
+ GetGroupName (uint32_t gid) override;
- virtual bool
+ bool
GetProcessInfo (lldb::pid_t pid,
- lldb_private::ProcessInstanceInfo &proc_info);
+ lldb_private::ProcessInstanceInfo &proc_info) override;
- virtual uint32_t
+ uint32_t
FindProcesses (const lldb_private::ProcessInstanceInfoMatch &match_info,
- lldb_private::ProcessInstanceInfoList &process_infos);
+ lldb_private::ProcessInstanceInfoList &process_infos) override;
- virtual lldb_private::Error
- LaunchProcess (lldb_private::ProcessLaunchInfo &launch_info);
+ lldb_private::Error
+ LaunchProcess (lldb_private::ProcessLaunchInfo &launch_info) override;
- virtual lldb::ProcessSP
+ lldb::ProcessSP
Attach(lldb_private::ProcessAttachInfo &attach_info,
lldb_private::Debugger &debugger,
lldb_private::Target *target,
- lldb_private::Error &error);
+ lldb_private::Error &error) override;
// FreeBSD processes can not be launched by spawning and attaching.
- virtual bool
- CanDebugProcess () { return false; }
+ bool
+ CanDebugProcess () override { return false; }
// Only on PlatformMacOSX:
- virtual lldb_private::Error
+ lldb_private::Error
GetFileWithUUID (const lldb_private::FileSpec &platform_file,
- const lldb_private::UUID* uuid, lldb_private::FileSpec &local_file);
+ const lldb_private::UUID* uuid, lldb_private::FileSpec &local_file) override;
lldb_private::Error
GetSharedModule (const lldb_private::ModuleSpec &module_spec,
@@ -158,14 +158,14 @@ public:
lldb::ModuleSP *old_module_sp_ptr,
bool *did_create_ptr) override;
- virtual bool
- GetSupportedArchitectureAtIndex (uint32_t idx, lldb_private::ArchSpec &arch);
+ bool
+ GetSupportedArchitectureAtIndex (uint32_t idx, lldb_private::ArchSpec &arch) override;
- virtual void
- GetStatus (lldb_private::Stream &strm);
+ void
+ GetStatus (lldb_private::Stream &strm) override;
- virtual void
- CalculateTrapHandlerSymbolNames ();
+ void
+ CalculateTrapHandlerSymbolNames () override;
protected:
lldb::PlatformSP m_remote_platform_sp; // Allow multiple ways to connect to a remote freebsd OS
Modified: lldb/trunk/source/Plugins/Platform/Windows/PlatformWindows.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/Windows/PlatformWindows.h?rev=233123&r1=233122&r2=233123&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/Windows/PlatformWindows.h (original)
+++ lldb/trunk/source/Plugins/Platform/Windows/PlatformWindows.h Tue Mar 24 17:10:47 2015
@@ -47,11 +47,11 @@ public:
static const char *
GetPluginDescriptionStatic(bool is_host);
- virtual lldb_private::ConstString
- GetPluginName(void);
+ lldb_private::ConstString
+ GetPluginName(void) override;
- virtual uint32_t
- GetPluginVersion(void)
+ uint32_t
+ GetPluginVersion(void) override
{
return 1;
}
@@ -59,77 +59,77 @@ public:
//------------------------------------------------------------
// lldb_private::Platform functions
//------------------------------------------------------------
- virtual bool
+ bool
GetModuleSpec (const lldb_private::FileSpec& module_file_spec,
const lldb_private::ArchSpec& arch,
- lldb_private::ModuleSpec &module_spec);
+ lldb_private::ModuleSpec &module_spec) override;
- virtual Error
+ Error
ResolveExecutable(const lldb_private::ModuleSpec &module_spec,
lldb::ModuleSP &module_sp,
- const FileSpecList *module_search_paths_ptr);
+ const FileSpecList *module_search_paths_ptr) override;
- virtual const char *
- GetDescription(void)
+ const char *
+ GetDescription(void) override
{
return GetPluginDescriptionStatic(IsHost());
}
- virtual size_t
+ size_t
GetSoftwareBreakpointTrapOpcode(lldb_private::Target &target,
- lldb_private::BreakpointSite *bp_site);
+ lldb_private::BreakpointSite *bp_site) override;
- virtual bool
- GetRemoteOSVersion(void);
+ bool
+ GetRemoteOSVersion(void) override;
- virtual bool
- GetRemoteOSBuildString(std::string &s);
+ bool
+ GetRemoteOSBuildString(std::string &s) override;
- virtual bool
- GetRemoteOSKernelDescription(std::string &s);
+ bool
+ GetRemoteOSKernelDescription(std::string &s) override;
// Remote Platform subclasses need to override this function
- virtual lldb_private::ArchSpec
- GetRemoteSystemArchitecture(void);
+ lldb_private::ArchSpec
+ GetRemoteSystemArchitecture(void) override;
- virtual bool
- IsConnected(void) const;
+ bool
+ IsConnected(void) const override;
- virtual lldb_private::Error
- ConnectRemote(lldb_private::Args& args);
+ lldb_private::Error
+ ConnectRemote(lldb_private::Args& args) override;
- virtual lldb_private::Error
- DisconnectRemote( void );
+ lldb_private::Error
+ DisconnectRemote( void ) override;
- virtual const char *
- GetHostname( void );
+ const char *
+ GetHostname( void ) override;
- virtual const char *
- GetUserName(uint32_t uid);
+ const char *
+ GetUserName(uint32_t uid) override;
- virtual const char *
- GetGroupName(uint32_t gid);
+ const char *
+ GetGroupName(uint32_t gid) override;
- virtual bool
+ bool
GetProcessInfo(lldb::pid_t pid,
- lldb_private::ProcessInstanceInfo &proc_info);
+ lldb_private::ProcessInstanceInfo &proc_info) override;
- virtual uint32_t
+ uint32_t
FindProcesses(const lldb_private::ProcessInstanceInfoMatch &match_info,
- lldb_private::ProcessInstanceInfoList &process_infos);
+ lldb_private::ProcessInstanceInfoList &process_infos) override;
- virtual lldb_private::Error
- LaunchProcess(lldb_private::ProcessLaunchInfo &launch_info);
+ lldb_private::Error
+ LaunchProcess(lldb_private::ProcessLaunchInfo &launch_info) override;
- virtual lldb::ProcessSP
+ lldb::ProcessSP
Attach(lldb_private::ProcessAttachInfo &attach_info,
lldb_private::Debugger &debugger,
lldb_private::Target *target,
- lldb_private::Error &error);
+ lldb_private::Error &error) override;
- virtual lldb_private::Error
+ lldb_private::Error
GetFileWithUUID(const lldb_private::FileSpec &platform_file,
- const lldb_private::UUID* uuid, lldb_private::FileSpec &local_file);
+ const lldb_private::UUID* uuid, lldb_private::FileSpec &local_file) override;
lldb_private::Error
GetSharedModule(const lldb_private::ModuleSpec &module_spec,
@@ -139,22 +139,22 @@ public:
lldb::ModuleSP *old_module_sp_ptr,
bool *did_create_ptr) override;
- virtual bool
- GetSupportedArchitectureAtIndex(uint32_t idx, lldb_private::ArchSpec &arch);
+ bool
+ GetSupportedArchitectureAtIndex(uint32_t idx, lldb_private::ArchSpec &arch) override;
- virtual void
- GetStatus(lldb_private::Stream &strm);
+ void
+ GetStatus(lldb_private::Stream &strm) override;
// Local debugging not yet supported
- virtual bool
- CanDebugProcess(void)
+ bool
+ CanDebugProcess(void) override
{
return false;
}
// FIXME not sure what the _sigtramp equivalent would be on this platform
- virtual void
- CalculateTrapHandlerSymbolNames ()
+ void
+ CalculateTrapHandlerSymbolNames () override
{
}
More information about the lldb-commits
mailing list