From 6dec949a97c13fa77d5f9f15f452c439e413c7b5 Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Tue, 11 May 1999 02:48:46 +0000 Subject: [PATCH] See ChangeLog entry 19990510-21:45 EDT David G. Holm --- harbour/ChangeLog | 9 +++++++++ harbour/source/compiler/harbour.y | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c7b83ad2a8..5388009aa7 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,12 @@ +19990510-21:45 EDT David G. Holm + * source/harbour.y + - Put back a C++ lvalue fix that appears to have gotten lost + during a diff merge: + Parameter in call to yy_switch_to_buffer with embedded + assignment needs () around the entire expression in order + to have the (YY_BUFFER_STATE) type override apply to the + result of the assignment. + Mon May 10 19:32:34 1999 Gonzalo A. Diethelm * makefile.b32: diff --git a/harbour/source/compiler/harbour.y b/harbour/source/compiler/harbour.y index c2ca7e6c7a..744b97c77a 100644 --- a/harbour/source/compiler/harbour.y +++ b/harbour/source/compiler/harbour.y @@ -1508,7 +1508,7 @@ int Include( char * szFileName ) files.pLast = pFile; } #ifdef __cplusplus - yy_switch_to_buffer( (YY_BUFFER_STATE) pFile->pBuffer = yy_create_buffer( yyin, 8192 * 2 ) ); + yy_switch_to_buffer( (YY_BUFFER_STATE) (pFile->pBuffer = yy_create_buffer( yyin, 8192 * 2 ) ) ); #else yy_switch_to_buffer( pFile->pBuffer = yy_create_buffer( yyin, 8192 * 2 ) ); #endif