From 07a900f0b7d8573b03711a40f512541ac413f43b Mon Sep 17 00:00:00 2001 From: Jeff Cohen Date: Thu, 9 Dec 2004 05:51:11 +0000 Subject: Fix residual Visual Studio build problems llvm-svn: 18688 --- llvm/lib/System/Win32/DynamicLibrary.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'llvm/lib/System/Win32/DynamicLibrary.cpp') diff --git a/llvm/lib/System/Win32/DynamicLibrary.cpp b/llvm/lib/System/Win32/DynamicLibrary.cpp index d743454746a..cc3376eedf9 100644 --- a/llvm/lib/System/Win32/DynamicLibrary.cpp +++ b/llvm/lib/System/Win32/DynamicLibrary.cpp @@ -12,7 +12,6 @@ //===----------------------------------------------------------------------===// #include "Win32.h" -#include namespace llvm { using namespace sys; @@ -23,33 +22,30 @@ using namespace sys; //===----------------------------------------------------------------------===// DynamicLibrary::DynamicLibrary() : handle(0) { - handle = new HMODULE; - *((HMODULE*)handle) = GetModuleHandle(NULL); + handle = (void*) GetModuleHandle(NULL); - if (*((HMODULE*)handle) == 0) { + if (handle == 0) { ThrowError("Can't GetModuleHandle: "); } } DynamicLibrary::DynamicLibrary(const char*filename) : handle(0) { - handle = new HMODULE; - *((HMODULE*)handle) = LoadLibrary(filename); + handle = LoadLibrary(filename); - if (*((HMODULE*)handle) == 0) { + if (handle == 0) { ThrowError("Can't LoadLibrary: "); } } DynamicLibrary::~DynamicLibrary() { assert(handle !=0 && "Invalid DynamicLibrary handle"); - if (*((HMODULE*)handle)) - FreeLibrary(*((HMODULE*)handle)); - delete (HMODULE*)handle; + if (handle) + FreeLibrary((HMODULE*)handle); } void *DynamicLibrary::GetAddressOfSymbol(const char *symbolName) { assert(handle !=0 && "Invalid DynamicLibrary handle"); - return (void*) GetProcAddress(*((HMODULE*)handle), symbolName); + return (void*) GetProcAddress((HMODULE*)handle, symbolName); } } -- cgit v1.2.3