EPICS Controls Argonne National Laboratory

Experimental Physics and
Industrial Control System

2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  <20162017  2018  2019  2020  2021  2022  Index 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  <20162017  2018  2019  2020  2021  2022 
<== Date ==> <== Thread ==>

Subject: Re: Merge conflict in base-3.16
From: Andrew Johnson <[email protected]>
To: <[email protected]>
Date: Wed, 7 Sep 2016 10:07:18 -0500
Thanks guys. The merge of fixes up to the 3.16 branch is now complete,
so we'll find out soon from Jenkins whether I broke anything on the
other architectures.

- Andrew

On 09/07/2016 02:52 AM, Ralph Lange wrote:
> On 07/09/2016 01:31, Michael Davidsaver wrote:
>> On 09/06/2016 07:04 PM, Andrew Johnson wrote:
>>> While merging the 3.15 changes into 3.16 I discovered these conflicting
>>> changes. Which one is correct, and if it's the 3.16 change, should it be
>>> back-ported to 3.15?
>> I think yours, though it may not make a difference practically.  If
>> copyInHeader() only fails in allocRawMsg() fails, in which case I think
>> no new message is ready to be sent.  In this case I would think that
>> commitMsg() is either a no-op, or an error.  I haven't look far enough
>> to tell which is the case.
> 
> 
> +1
> 
> My fix was only to suppress the "variable set but not used" warning, and
> not setting it was the easy fix without behavior change.
> 
> Cheers,
> ~Ralph
> 

-- 
Arguing for surveillance because you have nothing to hide is no
different than making the claim, "I don't care about freedom of
speech because I have nothing to say." -- Edward Snowdon

References:
Merge conflict in base-3.16 Andrew Johnson
Re: Merge conflict in base-3.16 Michael Davidsaver
Re: Merge conflict in base-3.16 Ralph Lange

Navigate by Date:
Prev: Re: Merge conflict in base-3.16 Ralph Lange
Next: Build failed in Jenkins: epics-base-3.16-mac-test #64 APS Jenkins
Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  <20162017  2018  2019  2020  2021  2022 
Navigate by Thread:
Prev: Re: Merge conflict in base-3.16 Ralph Lange
Next: Fix for building 3.15.4 on windows-x64-static Mark Rivers
Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  <20162017  2018  2019  2020  2021  2022 
ANJ, 07 Sep 2016 Valid HTML 4.01! · Home · News · About · Base · Modules · Extensions · Distributions · Download ·
· Search · EPICS V4 · IRMIS · Talk · Bugs · Documents · Links · Licensing ·