From db9b81e4d811f208058ade6938e99a2fb40c4812 Mon Sep 17 00:00:00 2001 From: ahodgkinson Date: Thu, 21 Sep 2006 19:07:23 +0000 Subject: [PATCH] FLAIM change. Fixed VS 2005 compiler warnings. git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@894 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- flaim/src/fdbcnfig.cpp | 4 ++-- flaim/src/fqcur.cpp | 4 ++-- flaim/src/fsv.cpp | 5 ++--- flaim/src/fsysdata.cpp | 2 +- flaim/src/imonutil.cpp | 6 +++--- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/flaim/src/fdbcnfig.cpp b/flaim/src/fdbcnfig.cpp index f4de41a..9da48df 100644 --- a/flaim/src/fdbcnfig.cpp +++ b/flaim/src/fdbcnfig.cpp @@ -715,7 +715,7 @@ Transmission_Error: { goto Exit; } - pLFile->bMakeFieldIdTable = (FLMBOOL)pvValue2; + pLFile->bMakeFieldIdTable = (FLMBOOL)((FLMUINT)pvValue2); } else if (pDb->pFile->pDictList) { @@ -724,7 +724,7 @@ Transmission_Error: { goto Exit; } - pLFile->bMakeFieldIdTable = (FLMBOOL)pvValue2; + pLFile->bMakeFieldIdTable = (FLMBOOL)((FLMUINT)pvValue2); } break; } diff --git a/flaim/src/fqcur.cpp b/flaim/src/fqcur.cpp index f61178c..034b0ef 100644 --- a/flaim/src/fqcur.cpp +++ b/flaim/src/fqcur.cpp @@ -1637,7 +1637,7 @@ FLMEXP RCODE FLMAPI FlmCursorConfig( break; case FCURSOR_RETURN_KEYS_OK: - pCursor->bOkToReturnKeys = (FLMBOOL)((FLMBOOL)Value1 ? TRUE : FALSE); + pCursor->bOkToReturnKeys = (FLMBOOL)((FLMBOOL)(FLMUINT)Value1 ? TRUE : FALSE); break; case FCURSOR_SET_FLM_IX: @@ -1695,7 +1695,7 @@ FLMEXP RCODE FLMAPI FlmCursorConfig( } rc = flmCurSetAbsolutePos( pCursor, *((FLMUINT *)Value1), - (FLMBOOL)Value2, + (FLMBOOL)(FLMUINT)Value2, (FLMUINT *)Value1); break; diff --git a/flaim/src/fsv.cpp b/flaim/src/fsv.cpp index 088f785..3265494 100644 --- a/flaim/src/fsv.cpp +++ b/flaim/src/fsv.cpp @@ -3093,10 +3093,9 @@ FSTATIC RCODE fsvIteratorFromParse( if (RC_BAD( rc = FlmCursorConfig( hIterator, FCURSOR_RETURN_KEYS_OK, - (void *) (FLMBOOL) (uiOkToReturnKeys + (void *) (FLMUINT)(uiOkToReturnKeys ? TRUE - : FALSE), - (void *) NULL))) + : FALSE), NULL))) { goto Exit; } diff --git a/flaim/src/fsysdata.cpp b/flaim/src/fsysdata.cpp index 47574d5..38d9ade 100644 --- a/flaim/src/fsysdata.cpp +++ b/flaim/src/fsysdata.cpp @@ -1093,7 +1093,7 @@ FLMEXP RCODE FLMAPI FlmConfig( f_mutexLock( gv_FlmSysData.hShareMutex); f_mutexLock( gv_FlmSysData.RCacheMgr.hMutex); gv_FlmSysData.bDynamicCacheAdjust = FALSE; - rc = flmSetCacheLimits( (FLMUINT)Value1, TRUE, (FLMBOOL)Value2); + rc = flmSetCacheLimits( (FLMUINT)Value1, TRUE, (FLMBOOL)(FLMUINT)Value2); f_mutexUnlock( gv_FlmSysData.RCacheMgr.hMutex); f_mutexUnlock( gv_FlmSysData.hShareMutex); break; diff --git a/flaim/src/imonutil.cpp b/flaim/src/imonutil.cpp index ff8bf9a..fd12559 100644 --- a/flaim/src/imonutil.cpp +++ b/flaim/src/imonutil.cpp @@ -4708,7 +4708,7 @@ RCODE F_DatabaseConfigPage::display( if( RC_OK( ExtractParameter( uiNumParams, ppszParams, szTmp, sizeof( szTmp), szTmp))) { FLMBOOL bFlag = f_atoi( szTmp) ? TRUE : FALSE; - rc = FlmDbConfig( hDb, FDB_RFL_KEEP_FILES, (void *)bFlag, NULL); + rc = FlmDbConfig( hDb, FDB_RFL_KEEP_FILES, (void *)(FLMUINT)bFlag, NULL); bExecuted = TRUE; } } @@ -4719,7 +4719,7 @@ RCODE F_DatabaseConfigPage::display( if( RC_OK( ExtractParameter( uiNumParams, ppszParams, szTmp, sizeof( szTmp), szTmp))) { FLMBOOL bFlag = f_atoi( szTmp) ? TRUE : FALSE; - rc = FlmDbConfig( hDb, FDB_AUTO_TURN_OFF_KEEP_RFL, (void *)bFlag, NULL); + rc = FlmDbConfig( hDb, FDB_AUTO_TURN_OFF_KEEP_RFL, (void *)(FLMUINT)bFlag, NULL); bExecuted = TRUE; } } @@ -4730,7 +4730,7 @@ RCODE F_DatabaseConfigPage::display( if( RC_OK( ExtractParameter( uiNumParams, ppszParams, szTmp, sizeof( szTmp), szTmp))) { FLMBOOL bFlag = f_atoi( szTmp) ? TRUE : FALSE; - rc = FlmDbConfig( hDb, FDB_KEEP_ABORTED_TRANS_IN_RFL, (void *)bFlag, NULL); + rc = FlmDbConfig( hDb, FDB_KEEP_ABORTED_TRANS_IN_RFL, (void *)(FLMUINT)bFlag, NULL); bExecuted = TRUE; } }