0024129: Eliminate remaining compiler warnings in MSVC++ 2008 32 bit with warning...

[occt.git] / src / Standard / Standard_MMgrOpt.cxx

diff --git a/src/Standard/Standard_MMgrOpt.cxx b/src/Standard/Standard_MMgrOpt.cxx
index bf34b1f..7f049b6 100755 (executable)
--- a/src/Standard/Standard_MMgrOpt.cxx
+++ b/src/Standard/Standard_MMgrOpt.cxx
@@ -793,10 +793,10 @@ retry:
                                     PAGE_READWRITE,
                                     DWORD(AlignedSize / 0x80000000),
                                     DWORD(AlignedSize % 0x80000000), NULL); 
-    HANDLE * aMBlock = NULL;
+    HANDLE * aMBlock = (hMap && GetLastError() != ERROR_ALREADY_EXISTS ? 
+                        (HANDLE*)MapViewOfFile(hMap,FILE_MAP_WRITE,0,0,0) : NULL);
     // check for error and try allocating address space
-    if ( ! hMap || GetLastError() == ERROR_ALREADY_EXISTS ||
-         ! ((aMBlock = (HANDLE*)MapViewOfFile(hMap,FILE_MAP_WRITE,0,0,0))) ) 
+    if ( ! aMBlock ) 
     {
       // close handle if allocated
       if ( hMap )