diff options
author | Morgan Deters <mdeters@gmail.com> | 2011-10-04 01:54:38 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2011-10-04 01:54:38 +0000 |
commit | 4c5a38bef4d9daefef4531e6148b4314c049d505 (patch) | |
tree | 96ae326b37b4bae2b0e7d1a74c97b868a7e9822d /src | |
parent | e92cc97ab7eea62b97cfea9f9fa08d4b6719be77 (diff) |
oops, one more fix, hopefully the last
Diffstat (limited to 'src')
-rw-r--r-- | src/parser/antlr_input.cpp | 6 | ||||
-rw-r--r-- | src/parser/memory_mapped_input_buffer.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/parser/antlr_input.cpp b/src/parser/antlr_input.cpp index 6ec1c5846..ec3b7077e 100644 --- a/src/parser/antlr_input.cpp +++ b/src/parser/antlr_input.cpp @@ -69,7 +69,7 @@ AntlrInputStream::newFileInputStream(const std::string& name, input = MemoryMappedInputBufferNew(name); } else { // libantlr3c v3.2 isn't source-compatible with v3.4 -#if CVC4_ANTLR3_OLD_INPUT_STREAM +#ifdef CVC4_ANTLR3_OLD_INPUT_STREAM input = antlr3AsciiFileStreamNew((pANTLR3_UINT8) name.c_str()); #else /* CVC4_ANTLR3_OLD_INPUT_STREAM */ input = antlr3FileStreamNew((pANTLR3_UINT8) name.c_str(), ANTLR3_ENC_8BIT); @@ -117,7 +117,7 @@ AntlrInputStream::newStreamInputStream(std::istream& input, } /* Create an ANTLR input backed by the buffer. */ -#if CVC4_ANTLR3_OLD_INPUT_STREAM +#ifdef CVC4_ANTLR3_OLD_INPUT_STREAM pANTLR3_INPUT_STREAM inputStream = antlr3NewAsciiStringInPlaceStream((pANTLR3_UINT8) basep, cp - basep, @@ -143,7 +143,7 @@ AntlrInputStream::newStringInputStream(const std::string& input, char* inputStr = strdup(input.c_str()); char* nameStr = strdup(name.c_str()); AlwaysAssert( inputStr!=NULL && nameStr!=NULL ); -#if CVC4_ANTLR3_OLD_INPUT_STREAM +#ifdef CVC4_ANTLR3_OLD_INPUT_STREAM pANTLR3_INPUT_STREAM inputStream = antlr3NewAsciiStringInPlaceStream((pANTLR3_UINT8) inputStr, input.size(), diff --git a/src/parser/memory_mapped_input_buffer.cpp b/src/parser/memory_mapped_input_buffer.cpp index 1c0f76e1e..f0b7a9d2c 100644 --- a/src/parser/memory_mapped_input_buffer.cpp +++ b/src/parser/memory_mapped_input_buffer.cpp @@ -61,7 +61,7 @@ pANTLR3_INPUT_STREAM MemoryMappedInputBufferNew(const std::string& filename) { // Call the common 8 bit ASCII input stream handler // Initializer type thingy doobry function. // -#if CVC4_ANTLR3_OLD_INPUT_STREAM +#ifdef CVC4_ANTLR3_OLD_INPUT_STREAM antlr3AsciiSetupStream(input, ANTLR3_CHARSTREAM); #else /* CVC4_ANTLR3_OLD_INPUT_STREAM */ antlr38BitSetupStream(input); |