On 15.03.2010, at 23:59, Albrecht Schlosser wrote:
> On 15.03.2010, at 20:48, Matthias Melcher wrote:

>>>> Thus, I propose to rename the id variable, although it is public,
>>>> but marked as "for internal use".
>>>>
>>>
>>> I fully agree it would be better to rename this id variable,
>>> even if this conflict is not likely to happen often
>>> because it occurs only for objective-c++ source files and only
>>> with gcc-3.
>>
>> Yes, please lets rename it.
>
> Okay, I'm just testing. Commit to follow shortly

...

> What I did until now:
>
> - renamed "id" to "id_"
> - renamed "mask" to "mask_"
>
> to distinguish these member variables from other variables (trailing
> underscore) in Fl_Image (class Fl_RGB_Image), Fl_Bitmap, and
> Fl_Pixmap (.h and .cxx, resp.).
>
> I also made both members *private* w/o any negative effects until now.
>
> Some more code cleanups by renaming local vars.

Okay, changes committed (r 7273).  Tested on Windows, Linux, and Mac.

Manolo, I hope that "id_" doesn't conflict with anything else on OS X.
Would you please remove your "hot fixes" ;-) to make the code clean
again?  I know there were at least two commits, but I'm too tired to
look for them now.  TIA.

Albrecht
_______________________________________________
fltk-dev mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-dev

Reply via email to