]> granicus.if.org Git - llvm/commitdiff
Do not pollute the namespace in a header file.
authorKristof Beyls <kristof.beyls@arm.com>
Fri, 31 Mar 2017 12:00:24 +0000 (12:00 +0000)
committerKristof Beyls <kristof.beyls@arm.com>
Fri, 31 Mar 2017 12:00:24 +0000 (12:00 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@299203 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Support/Windows/DynamicLibrary.inc

index 25ecb16b373b2b92237b5d503d4b5ee160a6c489..709499deeafa93c0fadbdc555fa48232850b45dc 100644 (file)
@@ -24,7 +24,6 @@
 #endif
 
 namespace llvm {
-using namespace sys;
 
 //===----------------------------------------------------------------------===//
 //=== WARNING: Implementation here must contain only Win32 specific code
@@ -51,8 +50,9 @@ ELM_Callback(PCSTR ModuleName, DWORD64 ModuleBase,
   return TRUE;
 }
 
-DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename,
-                                                   std::string *errMsg) {
+sys::DynamicLibrary
+sys::DynamicLibrary::getPermanentLibrary(const char *filename,
+                                         std::string *errMsg) {
   SmartScopedLock<true> lock(*SymbolsMutex);
 
   if (!filename) {
@@ -92,8 +92,8 @@ DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename,
   return DynamicLibrary(a_handle);
 }
 
-DynamicLibrary DynamicLibrary::addPermanentLibrary(void *handle,
-                                                   std::string *errMsg) {
+sys::DynamicLibrary
+sys::DynamicLibrary::addPermanentLibrary(void *handle, std::string *errMsg) {
   SmartScopedLock<true> lock(*SymbolsMutex);
   // If we've already loaded this library, tell the caller.
   if (!OpenedHandles->insert((HMODULE)handle).second) {
@@ -129,7 +129,7 @@ DynamicLibrary DynamicLibrary::addPermanentLibrary(void *handle,
 #undef INLINE_DEF_SYMBOL1
 #undef INLINE_DEF_SYMBOL2
 
-void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) {
+void *sys::DynamicLibrary::SearchForAddressOfSymbol(const char *symbolName) {
   SmartScopedLock<true> Lock(*SymbolsMutex);
 
   // First check symbols added via AddSymbol().
@@ -177,7 +177,7 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) {
   return 0;
 }
 
-void *DynamicLibrary::getAddressOfSymbol(const char *symbolName) {
+void *sys::DynamicLibrary::getAddressOfSymbol(const char *symbolName) {
   if (!isValid())
     return NULL;
   if (Data == &OpenedHandles)