--- trunk/src/antlr/BaseAST.cpp 2010/05/10 17:28:26 1442 +++ branches/development/src/antlr/BaseAST.cpp 2011/09/15 13:39:36 1633 @@ -5,9 +5,10 @@ * $Id$ */ +#include "antlr/config.hpp" + #include -#include "antlr/config.hpp" #include "antlr/AST.hpp" #include "antlr/BaseAST.hpp" @@ -15,8 +16,6 @@ namespace antlr { #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { #endif - -const char* const BaseAST::TYPE_NAME = "BaseAST"; size_t BaseAST::getNumberOfChildren() const { @@ -271,7 +270,8 @@ ANTLR_API RefAST nullAST; // this is nasty, but it makes the code generation easier ANTLR_API RefAST nullAST; -#if defined(_MSC_VER) && !defined(__ICL) // Microsoft Visual C++ +#if defined(_MSC_VER) && !defined(__ICL) +// Microsoft Visual C++ extern ANTLR_API AST* const nullASTptr = 0; #else ANTLR_API AST* const nullASTptr = 0;