[llvm-commits] CVS: llvm/lib/System/Win32/DynamicLibrary.cpp

[Jeff Cohen]

Changes in directory llvm/lib/System/Win32:

DynamicLibrary.cpp updated: 1.3 -> 1.4
---
Log message:

Fix residual Visual Studio build problems

---
Diffs of the changes:  (+7 -11)

Index: llvm/lib/System/Win32/DynamicLibrary.cpp
diff -u llvm/lib/System/Win32/DynamicLibrary.cpp:1.3 llvm/lib/System/Win32/DynamicLibrary.cpp:1.4
--- llvm/lib/System/Win32/DynamicLibrary.cpp:1.3	Mon Nov 29 04:39:46 2004
+++ llvm/lib/System/Win32/DynamicLibrary.cpp	Wed Dec  8 23:51:11 2004
@@ -12,7 +12,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "Win32.h"
-#include <windef.h>
 
 namespace llvm {
 using namespace sys;
@@ -23,33 +22,30 @@
 //===----------------------------------------------------------------------===//
 
 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);
 }
 
 }