Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/tools/common/kFileDef.cpp

    r9164 r21916  
    119119
    120120
    121 kFileDef::kFileDef(kFile *pFile) :
     121kFileDef::kFileDef(kFile *pFile) throw (kError) :
    122122    kFileFormatBase(pFile),
    123123    pszType(NULL), pszModName(NULL), pszBase(NULL), pszCode(NULL), pszData(NULL), pszDescription(NULL),
    … …  
    137137 * Destructor. Frees used memory.
    138138 */
    139 kFileDef::~kFileDef()
     139kFileDef::~kFileDef() throw (kError)
    140140{
    141141    if (pszType        != NULL) delete pszType;
    … …  
    182182 * @remark  throws errorcode on error (TODO: errorhandling)
    183183 */
    184 void kFileDef::read(kFile *pFile)
     184void kFileDef::read(kFile *pFile) throw (kError)
    185185{
    186186    char *pszTmp;
    … …  
    445445 * @remark    tabs are expanded. string is trimmed. comments removed.
    446446 */
    447 char *kFileDef::readln(kFile *pFile, char *pszBuffer, int cbBuffer)
     447char *kFileDef::readln(kFile *pFile, char *pszBuffer, int cbBuffer) throw (kError)
    448448{
    449449    int i;
    … …  
    700700 * @remark
    701701 */
    702 KBOOL kFileDef::makeWatcomLinkFileAddtion(kFile *pOut, int enmOS)
     702KBOOL kFileDef::makeWatcomLinkFileAddtion(kFile *pOut, int enmOS) throw(kError)
    703703{
    704704    PDEFSEGMENT pSeg;
Note: See TracChangeset for help on using the changeset viewer.