Ignore:
Timestamp:
Aug 31, 2023, 11:31:15 PM (2 years ago)
Author:
JiadaL <j82liang@…>
Branches:
master
Children:
950c58e
Parents:
92355883 (diff), 686912c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Resolve conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/parseconfig.hfa

    r92355883 r2a301ff  
    22
    33#include <math.trait.hfa>
     4#include <Exception.hfa>
    45
    56
     
    6263
    6364
    64 exception Missing_Config_Entries {
     65ExceptionDecl( Missing_Config_Entries,
    6566        unsigned int num_missing;
    66 };
     67);
    6768
    6869[ void ] msg( * Missing_Config_Entries ex );
    6970
    70 exception Parse_Failure {
     71ExceptionDecl( Parse_Failure,
    7172        * char failed_key;
    7273        * char failed_value;
    73 };
     74);
    7475
    7576[ void ] msg( * Parse_Failure ex );
    7677
    77 exception Validation_Failure {
     78ExceptionDecl( Validation_Failure,
    7879        * char failed_key;
    7980        * char failed_value;
    80 };
     81);
    8182
    8283[ void ] msg( * Validation_Failure ex );
Note: See TracChangeset for help on using the changeset viewer.