From e7e59fe71ce84df01405ee2e16df6b85db74c0d7 Mon Sep 17 00:00:00 2001 From: ahodgkinson Date: Mon, 5 Jun 2006 23:26:46 +0000 Subject: [PATCH] Fixed OS X warnings. git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@512 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- ftk/src/ftk.h | 2 +- ftk/src/ftkmisc.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ftk/src/ftk.h b/ftk/src/ftk.h index dabf3dc..5157438 100644 --- a/ftk/src/ftk.h +++ b/ftk/src/ftk.h @@ -1992,7 +1992,7 @@ virtual RCODE FLMAPI getThreadName( FLMUINT uiThreadId, char * pszThreadName, - FLMUINT * puiLength); + FLMUINT * puiLength) = 0; virtual FLMUINT FLMAPI getThreadGroupCount( FLMUINT uiThreadGroup) = 0; diff --git a/ftk/src/ftkmisc.cpp b/ftk/src/ftkmisc.cpp index 05d048c..161b019 100644 --- a/ftk/src/ftkmisc.cpp +++ b/ftk/src/ftkmisc.cpp @@ -102,8 +102,8 @@ RCODE FLMAPI ftkStartup( void) // Sanity check -- make sure we are using the correct // byte-swap macros for this platform - flmAssert( FB2UD( "\x0A\x0B\x0C\x0D") == 0x0D0C0B0A); - flmAssert( FB2UW( "\x0A\x0B") == 0x0B0A); + flmAssert( FB2UD( (FLMBYTE *)"\x0A\x0B\x0C\x0D") == 0x0D0C0B0A); + flmAssert( FB2UW( (FLMBYTE *)"\x0A\x0B") == 0x0B0A); #if defined( FLM_RING_ZERO_NLM) if( RC_BAD( rc = f_netwareStartup()))