diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-06-03 17:01:36 +0200 |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-06-03 17:01:36 +0200 |
| commit | ed4d11640ac6166c0970de613a9ca4b39946b4a3 (patch) | |
| tree | c5164139863c1369b2c0a6bf6ef4e59221a59ffd | |
| parent | ee2b8bf7e68c5e755dc6be3a39d9a09788cdad28 (diff) | |
| parent | a1d91bdeb5e409341c3b04d3eca5cc2128245699 (diff) | |
Merge branch 'master' into 4.6
| -rw-r--r-- | generator/parser/rpp/pp-engine-bits.h | 2 | ||||
| -rw-r--r-- | generator/parser/rpp/pp-engine.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/generator/parser/rpp/pp-engine-bits.h b/generator/parser/rpp/pp-engine-bits.h index dbccd98..734ea8c 100644 --- a/generator/parser/rpp/pp-engine-bits.h +++ b/generator/parser/rpp/pp-engine-bits.h @@ -188,6 +188,8 @@ inline pp::PP_DIRECTIVE_TYPE pp::find_directive (char const *__directive, std::s case 7: if (__directive[0] == 'i' && !strcmp (__directive, "include")) return PP_INCLUDE; + else if (__directive[0] == 'w' && !strcmp(__directive, "warning")) + return PP_WARNING; break; case 12: diff --git a/generator/parser/rpp/pp-engine.h b/generator/parser/rpp/pp-engine.h index e8e0d52..832e1fe 100644 --- a/generator/parser/rpp/pp-engine.h +++ b/generator/parser/rpp/pp-engine.h @@ -138,7 +138,8 @@ class pp PP_IFNDEF, PP_UNDEF, PP_PRAGMA, - PP_ERROR + PP_ERROR, + PP_WARNING }; public: |