--- trunk/src/antlr/TokenStreamRewriteEngine.cpp	2005/12/02 15:38:03	770
+++ branches/development/src/antlr/TokenStreamRewriteEngine.cpp	2011/09/15 13:39:36	1633
@@ -1,3 +1,5 @@
+#include <antlr/config.hpp>
+
 #include <string>
 #include <list>
 #include <vector>
@@ -8,8 +10,6 @@
 #include <sstream>
 #include <cassert>
 
-#include <antlr/config.hpp>
-
 #include <antlr/TokenStream.hpp>
 #include <antlr/TokenWithIndex.hpp>
 #include <antlr/BitSet.hpp>
@@ -19,6 +19,11 @@ namespace antlr {
 namespace antlr {
 #endif
 
+#ifndef NO_STATIC_CONSTS
+const size_t TokenStreamRewriteEngine::MIN_TOKEN_INDEX = 0;
+const int TokenStreamRewriteEngine::PROGRAM_INIT_SIZE = 100;
+#endif
+
 const char* TokenStreamRewriteEngine::DEFAULT_PROGRAM_NAME = "default";
 
 namespace {
@@ -37,7 +42,7 @@ namespace {
 		}
 		ANTLR_USE_NAMESPACE(std)ostream& out;
 	};
-};
+}
 
 TokenStreamRewriteEngine::TokenStreamRewriteEngine(TokenStream& upstream)
 : stream(upstream)