From: <sil...@li...> - 2003-02-03 06:10:42
|
Update of /cvsroot/silgraphite/silgraphite/include In directory sc8-pr-cvs1:/tmp/cvs-serv13988/include Modified Files: GrData.h GrResult.h Log Message: remove C++ style comments Index: GrData.h =================================================================== RCS file: /cvsroot/silgraphite/silgraphite/include/GrData.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- GrData.h 5 Nov 2002 23:42:10 -0000 1.2 +++ GrData.h 3 Feb 2003 06:10:40 -0000 1.3 @@ -11,6 +11,10 @@ Description: Data structures needed by the Graphite engine, particularly for argument passing. NOT to be used within FieldWorks +Special Note: + This .h file need to be used by C compiler. Please keep using C style comment . + Please do NOT use C++ style comment in this file. + ----------------------------------------------------------------------------------------------*/ #ifdef _MSC_VER #pragma once @@ -18,7 +22,9 @@ #ifndef GRDATA_INCLUDED #define GRDATA_INCLUDED +/* //:End Ignore + */ typedef struct tagLgCharRenderProps { @@ -93,12 +99,14 @@ typedef enum tagFwTextColor { kclrWhite = 0xffffff, kclrBlack = 0, +/* // kclrRed = 0xff, // kclrGreen = 0xff00, // kclrBlue = 0xff0000, // kclrYellow = 0xffff, // kclrMagenta = 0xff00ff, // kclrCyan = 0xffff00, + */ kclrReserved1 = 0x80000000, kclrReserved2 = 0x80000001, kclrTransparent = 0xc0000000 @@ -131,4 +139,4 @@ DEFINE_COM_PTR(cls); *****/ -#endif // !GRDATA_INCLUDED +#endif /* !GRDATA_INCLUDED */ Index: GrResult.h =================================================================== RCS file: /cvsroot/silgraphite/silgraphite/include/GrResult.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- GrResult.h 2 Jan 2003 21:18:42 -0000 1.3 +++ GrResult.h 3 Feb 2003 06:10:40 -0000 1.4 @@ -11,6 +11,9 @@ Description: Support for the GrResult and error handling in the Graphite engine. Also argument checking. Much of this is set up to parallel standard COM behavior. +Special Note: + This file need to be used by C file. Please do not use C++ style comment but use + ONLY C style commen in this file to make C compiler happy. ----------------------------------------------------------------------------------------------*/ #ifdef _MSC_VER #pragma once @@ -18,36 +21,38 @@ #ifndef GRRESULT_INCLUDED #define GRRESULT_INCLUDED +/* //:End Ignore + */ -//:>******************************************************************************************** -//:> Result flags -//:>******************************************************************************************** +/*:>********************************************************************************************/ +/*:> Result flags */ +/*:>********************************************************************************************/ -// These are return values for the main interface methods to indicate various kinds of -// error conditions. To facilitate COM compatibiliy, they match the standard COM HRESULT codes. +/* These are return values for the main interface methods to indicate various kinds of */ +/* error conditions. To facilitate COM compatibiliy, they match the standard COM HRESULT codes. */ typedef enum GrResult { - kresOk = 0, // S_OK - kresFalse = 1, // S_FALSE - kresFail = 0x80004005L, // E_FAIL - kresOutOfMemory = 0x8007000EL, // E_OUTOFMEMORY - kresInvalidArg = 0x80000002L, // E_INVALIDARG - kresReadFault = 0x80000001L, // STG_E_READFAULT - kresUnexpected = 0x80000003L, // E_UNEXPECTED - kresNotImpl = 0x80000004L, // E_NOTIMPL -// kresPointer = 0x80004003, // E_POINTER + kresOk = 0, /* S_OK */ + kresFalse = 1, /* S_FALSE */ + kresFail = 0x80004005L, /* E_FAIL */ + kresOutOfMemory = 0x8007000EL, /* E_OUTOFMEMORY */ + kresInvalidArg = 0x80000002L, /* E_INVALIDARG */ + kresReadFault = 0x80000001L, /* STG_E_READFAULT */ + kresUnexpected = 0x80000003L, /* E_UNEXPECTED */ + kresNotImpl = 0x80000004L, /* E_NOTIMPL */ +/* kresPointer = 0x80004003, /* E_POINTER */ }; -#define ResultFailed(res) (res != kresOk) // && res != kresFalse +#define ResultFailed(res) (res != kresOk) /* && res != kresFalse */ -#define ResultSucceeded(res) (res == kresOk) // || res == kresFalse +#define ResultSucceeded(res) (res == kresOk) /* || res == kresFalse */ -//:>******************************************************************************************** -//:> Error handling -//:>******************************************************************************************** -// These are set up as #defines so we can easily adjust them once we know how errors should -// be handled. +/*:>********************************************************************************************/ +/*:> Error handling */ +/*:>********************************************************************************************/ +/* These are set up as #defines so we can easily adjust them once we know how errors should */ +/* be handled. */ #define ReturnResult(res) return res @@ -55,14 +60,14 @@ #define THROW(res) ThrowInternalError(res) #else #define THROW(res) throw res -#endif // GR_FW +#endif /* GR_FW */ #define WARN(res) res -//:>******************************************************************************************** -//:> Argument checking -//:>******************************************************************************************** +/*:>********************************************************************************************/ +/*:> Argument checking */ +/*:>********************************************************************************************/ #define ChkGrArgPtr(p) \ { \ @@ -96,4 +101,4 @@ AssertBstrN(bstr); \ -#endif // !GRRESULT_INCLUDED +#endif /* !GRRESULT_INCLUDED */ |