# HG changeset patch
# User timkelly
# Date 1246544683 18000
# Node ID c94ed1efeb2cca11028b61d7c497a8ccaf6d6732
# Parent  8eb6e0d135f2a5660584b3201b1ba9237304e07b# Parent  82c247e583d43d3ee3807da2a7838be356f813c0
merge commit

diff -r 82c247e583d4 -r c94ed1efeb2c project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/parser/ASTTokenManager.java
--- a/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/parser/ASTTokenManager.java	Wed Jul 01 16:23:50 2009 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/parser/ASTTokenManager.java	Thu Jul 02 09:24:43 2009 -0500
@@ -132,6 +132,8 @@
 			return -1;
 		case IToken.PUNC:
 			return -1;
+		case IToken.CHAR:
+			return -1;
 		case IToken.RAW:
 			if (iToken.getText().length() == 0)
 				return -1;