Commit 36d43051 authored by Damien Lacoste's avatar Damien Lacoste
Browse files

Merge branch 'remove_MAKE_EXCEPT_MACRO' into 'main' 

client: apiexcept renamed to ApiExcept and MAKE_EXCEPT macro removed

This was done in the great splitting of code but was deemed out of scope, so let's have it here.

See merge request !1559
parents c7fc316f 16d6a70e

src/client/apiexcept.cpp→src/client/ApiExcept.cpp

+3 −1
Original line number Diff line number Diff line
@@ -4,8 +4,10 @@ 
 * SPDX-License-Identifier: LGPL-3.0-or-later

 */



#include <tango/client/apiexcept.h>

#include <tango/client/ApiExcept.h>



#include <tango/client/NamedDevFailed.h>

#include <tango/client/NamedDevFailedList.h>

#include <tango/server/tango_config.h>



namespace Tango

src/client/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ set(SOURCES DbClass.cpp 
            GroupCmdReply.cpp

            GroupReply.cpp

            filedatabase.cpp

            apiexcept.cpp

            ApiExcept.cpp

            accessproxy.cpp

            lockthread.cpp

            event.cpp

src/client/Connection_asyn.cpp

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


#include <tango/internal/telemetry/telemetry_kernel_macros.h>



#include <tango/client/apiexcept.h>

#include <tango/client/ApiExcept.h>

#include <tango/client/ApiUtil.h>

#include <tango/client/Database.h>

src/client/dbapi_datum.cpp

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * SPDX-License-Identifier: LGPL-3.0-or-later

 */



#include <tango/client/apiexcept.h>

#include <tango/client/ApiExcept.h>

#include <tango/client/DbDatum.h>

#include <tango/server/tango_config.h>

src/client/devapi_attr.cpp

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


#include <tango/internal/utils.h>



#include <tango/client/apiexcept.h>

#include <tango/client/ApiExcept.h>

#include <tango/client/DeviceAttribute.h>

#include <tango/common/tango_const.h>

#include <tango/server/SeqVec.h>