Hi Lars,
 
Yes, that is OK.
 
Leo
 
From:
cdt-dev-bounces@xxxxxxxxxxx [mailto:cdt-dev-bounces@xxxxxxxxxxx] On Behalf Of Lars.Kurth@xxxxxxxxxxx
Sent: Tuesday, May 31, 2005 3:47
PM
To: CDT
 General developers list.
Subject: RE: [cdt-dev] New code:
IOptionApplicability - Merge conflict
 
 
> The IOptionApplicability
methods 
Is it
OK, if for now I only replace ITool by IHoldsOptions? 
--
Lars 
 
  | "Treggiari, Leo"
  <leo.treggiari@xxxxxxxxx> Sent
  by: cdt-dev-bounces@xxxxxxxxxxx
 31/05/2005 20:06  
   
    | Please
    respond to"CDT General developers list."
    <cdt-dev@xxxxxxxxxxx>
 |  
 | 
   
    | To | "CDT General
     developers list." <cdt-dev@xxxxxxxxxxx>
     |  
    | cc |   |  
    | Subject | RE: [cdt-dev] New code: IOptionApplicability
    - Merge conflict |    
 | 
Hi Lars, 
  
I intended to resolve this when I applied your patch.
 Is that OK, or do you need to make the change yourself in order to
continue?  The IOptionApplicability methods should take the following
arguments (which I realized after talking to you last Friday): 
  
method (IBuildObject parentConfiguration,  // May be an
IConfiguration or IResourceConfiguration 
            IOptionHandler
optionHandler,
            IOption option) 
  
Regards, 
Leo 
  
 
From:
cdt-dev-bounces@xxxxxxxxxxx [mailto:cdt-dev-bounces@xxxxxxxxxxx] On Behalf Of Lars.Kurth@xxxxxxxxxxx
Sent: Tuesday, May 31, 2005 3:00 PM
To: CDT General developers list.
Subject: [cdt-dev] New code: IOptionApplicability - Merge conflict
  
Hi, 
I am trying to merge the latest changes from CDT-build such that I can prepare
a patch for CDT tomorrow. The following newly introduced code is causing
difficulties: 
 - IOptionApplicability has
     methods, which use ITool as parent for an option 
- We have moved all
     functionality which was in ITool and had to do with the capability of
     holding options into a common interface IHoldsOptions 
- I have a real merge
     conflict with the function IOptionApplicability.isOptionEnabled() which
     would have to have the type IHoldsOptions 
- For the other members of
     IOptionApplicability this would probably be necessary as well
How would this be resolved? 
Regards 
-- Lars 
 
**********************************************************************
Symbian Software Ltd is a company registered in England and Wales with
registered number 4190020 and registered office at 2-6 Boundary Row, Southwark,
London, SE1 8HP, UK. This message is intended only for use by the named
addressee and may contain privileged and/or confidential information. If you
are not the named addressee you should not disseminate, copy or take any action
in reliance on it. If you have received this message in error please notify
postmaster@xxxxxxxxxxx and delete the message and any attachments accompanying
it immediately. Neither Symbian nor any of its subsidiaries accepts liability
for any corruption, interception, amendment, tampering or viruses occurring to
this message in transit or for any message sent by its employees which is not
in compliance with Symbian corporate policy. **********************************************************************
_______________________________________________
cdt-dev mailing list
cdt-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/cdt-dev