Author: labath
Date: Tue Mar 5 04:51:20 2019
New Revision: 355398
URL: http://llvm.org/viewvc/llvm-project?rev=355398&view=rev
Log:
One more UserIDResolver fix
The intention in r355323 has been to implement a no-op resolver in the
HostInfoBase class, which will then be shadowed a an implementation in
the HostInfoPosix class. However, I add the shadowing declaration in
HostInfoPosix.h, and instead had implemented the HostInfoBase function
in HostInfoPosix.cpp. This has lead to undefined symbols on windows, and
a subsequent implementation of a no-op resolver in HostInfoWindows
(r355329).
Since now there is no point on having a no-op resolver in the base
class, I just remove the base declaration altogether, and have
HostInfoPosix implement the (newly-declared) HostInfoPosix version of
that function.
Modified:
lldb/trunk/include/lldb/Host/HostInfoBase.h
lldb/trunk/include/lldb/Host/posix/HostInfoPosix.h
lldb/trunk/source/Host/posix/HostInfoPosix.cpp
Modified: lldb/trunk/include/lldb/Host/HostInfoBase.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Host/HostInfoBase.h?rev=355398&r1=355397&r2=355398&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Host/HostInfoBase.h (original)
+++ lldb/trunk/include/lldb/Host/HostInfoBase.h Tue Mar 5 04:51:20 2019
@@ -99,8 +99,6 @@ public:
//---------------------------------------------------------------------------
static ArchSpec GetAugmentedArchSpec(llvm::StringRef triple);
- static UserIDResolver &GetUserIDResolver();
-
protected:
static bool ComputeSharedLibraryDirectory(FileSpec &file_spec);
static bool ComputeSupportExeDirectory(FileSpec &file_spec);
Modified: lldb/trunk/include/lldb/Host/posix/HostInfoPosix.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Host/posix/HostInfoPosix.h?rev=355398&r1=355397&r2=355398&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Host/posix/HostInfoPosix.h (original)
+++ lldb/trunk/include/lldb/Host/posix/HostInfoPosix.h Tue Mar 5 04:51:20 2019
@@ -35,6 +35,8 @@ public:
static bool ComputePathRelativeToLibrary(FileSpec &file_spec,
llvm::StringRef dir);
+ static UserIDResolver &GetUserIDResolver();
+
protected:
static bool ComputeSupportExeDirectory(FileSpec &file_spec);
static bool ComputeHeaderDirectory(FileSpec &file_spec);
Modified: lldb/trunk/source/Host/posix/HostInfoPosix.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/posix/HostInfoPosix.cpp?rev=355398&r1=355397&r2=355398&view=diff
==============================================================================
--- lldb/trunk/source/Host/posix/HostInfoPosix.cpp (original)
+++ lldb/trunk/source/Host/posix/HostInfoPosix.cpp Tue Mar 5 04:51:20 2019
@@ -106,7 +106,7 @@ llvm::Optional<std::string> PosixUserIDR
static llvm::ManagedStatic<PosixUserIDResolver> g_user_id_resolver;
-UserIDResolver &HostInfoBase::GetUserIDResolver() {
+UserIDResolver &HostInfoPosix::GetUserIDResolver() {
return *g_user_id_resolver;
}
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
