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  Index 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  <20162017  2018 
<== Date ==> <== Thread ==>

Subject: Merge conflict in base-3.16
From: Andrew Johnson <anj@aps.anl.gov>
To: EPICS core-talk <core-talk@aps.anl.gov>
Date: Tue, 6 Sep 2016 18:04:50 -0500
On the 3.15 branch, Ralph committed this change:

> ------------------------------------------------------------
> revno: 12770
> committer: Ralph Lange <ralph.lange@gmx.de>
> branch nick: trunk
> timestamp: Thu 2016-05-26 14:14:56 +0200
> message:
>   pcas: fix compiler warning (gcc 5.3.1)
> diff:
> === modified file 'src/ca/legacy/pcas/generic/casDGClient.cc'
> --- src/ca/legacy/pcas/generic/casDGClient.cc   2012-04-12 16:13:50 +0000
> +++ src/ca/legacy/pcas/generic/casDGClient.cc   2016-05-26 12:14:56 +0000
> @@ -348,10 +348,8 @@
>  //
>  caStatus casDGClient::searchFailResponse ( const caHdrLargeArray * mp )
>  {
> -       int             status;
> -
>      epicsGuard < epicsMutex > guard ( this->mutex );
> -    status = this->out.copyInHeader ( CA_PROTO_NOT_FOUND, 0,
> +    this->out.copyInHeader ( CA_PROTO_NOT_FOUND, 0,
>          mp->m_dataType, mp->m_count, mp->m_cid, mp->m_available, 0 );
>  
>         this->out.commitMsg ();


On the 3.16 branch, I committed this change:

> ------------------------------------------------------------
> revno: 12695
> committer: Andrew Johnson <anj@aps.anl.gov>
> branch nick: 3.16
> timestamp: Sun 2015-10-18 21:41:46 -0500
> message:
>   Clean up g++ unused-but-set-variable warning in pcas
> diff:
> === modified file 'src/ca/legacy/pcas/generic/casDGClient.cc'
> --- src/ca/legacy/pcas/generic/casDGClient.cc   2012-04-12 16:13:50 +0000
> +++ src/ca/legacy/pcas/generic/casDGClient.cc   2015-10-19 02:41:46 +0000
> @@ -354,9 +354,11 @@
>      status = this->out.copyInHeader ( CA_PROTO_NOT_FOUND, 0,
>          mp->m_dataType, mp->m_count, mp->m_cid, mp->m_available, 0 );
>  
> -       this->out.commitMsg ();
> +    if ( status == S_cas_success ) {
> +        this->out.commitMsg ();
> +    }
>  
> -       return S_cas_success;
> +    return S_cas_success;
>  }
>  
>  /*

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?

Whichever is right, I'm almost done with updating the 3.16 branch.

- Andrew

-- 
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

Replies:
Re: Merge conflict in base-3.16 Michael Davidsaver

Navigate by Date:
Prev: Jenkins build is back to normal : epics-base-3.15-win32-test #72 APS Jenkins
Next: Re: Merge conflict in base-3.16 Michael Davidsaver
Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  <20162017  2018 
Navigate by Thread:
Prev: Jenkins build is back to stable : epics-base-3.14 #199 APS Jenkins
Next: Re: Merge conflict in base-3.16 Michael Davidsaver
Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  <20162017  2018 
ANJ, 27 Sep 2016 Valid HTML 4.01! · Home · News · About · Base · Modules · Extensions · Distributions · Download ·
· Search · EPICS V4 · IRMIS · Talk · Bugs · Documents · Links · Licensing ·