[aaf-commits] AAF/ref-impl/src/OM OMDynamicLibrary.cpp, 1.8, 1.9 OMUtilities.cpp, 1.66, 1.67

[Stuart C. <stu...@us...>]

Update of /cvsroot/aaf/AAF/ref-impl/src/OM
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv1871/ref-impl/src/OM

Modified Files:
	OMDynamicLibrary.cpp OMUtilities.cpp 
Log Message:
Fix g++ on WIN32 warnings.


Index: OMDynamicLibrary.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/OM/OMDynamicLibrary.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** OMDynamicLibrary.cpp	27 Oct 2004 14:07:18 -0000	1.8
--- OMDynamicLibrary.cpp	12 Apr 2007 12:57:57 -0000	1.9
***************
*** 124,128 ****
    }
  #endif
!   result = address;
    return result;
  }
--- 124,128 ----
    }
  #endif
!   result = (void *)address;
    return result;
  }
***************
*** 173,177 ****
  
    if (_library != 0) {
!     BOOL freed = FreeLibrary((HINSTANCE)_library);
  #if defined(OM_DYNAMIC_LIBRARY_DEBUG)
      if (!freed) {
--- 173,180 ----
  
    if (_library != 0) {
! #if defined(OM_DYNAMIC_LIBRARY_DEBUG)
!     BOOL freed =
! #endif
!     FreeLibrary((HINSTANCE)_library);
  #if defined(OM_DYNAMIC_LIBRARY_DEBUG)
      if (!freed) {

Index: OMUtilities.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/OM/OMUtilities.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** OMUtilities.cpp	15 Jun 2006 03:23:24 -0000	1.66
--- OMUtilities.cpp	12 Apr 2007 12:58:01 -0000	1.67
***************
*** 836,840 ****
    DWORD version = GetVersion();
    BYTE majorVersion = (BYTE)(version        & 0x000000ff);
!   BYTE minorVersion = (BYTE)((version >> 8) & 0x000000ff);
    if (version < 0x80000000) {
      result = wkProfessional;
--- 836,842 ----
    DWORD version = GetVersion();
    BYTE majorVersion = (BYTE)(version        & 0x000000ff);
!   // If minorVersion is needed use:
!   // minorVersion = (BYTE)((version >> 8) & 0x000000ff);
! 
    if (version < 0x80000000) {
      result = wkProfessional;