Commit ba320b77 authored by Thomas Braun's avatar Thomas Braun
Browse files

Merge branch 'reorganize-cmake-preproc-defines' into 'main' 

Reorganize header files with cmake/preprocessor defines

Close #1591

See merge request !1565
parents 6a126222 713fefcf

.pre-commit-config.yaml

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ repos: 
      entry: ./ci/check-header-guard.sh

      exclude: '(tests/cxxtest/.*\.h)|(src/client/doc\.h)'

      language: script

      files: \.h$

      files: (\.h(\.in)?)$



- repo: https://github.com/espressif/check-copyright/

  rev: v1.1.1

src/client/AccessProxy.cpp

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include <tango/client/AccessProxy.h>



#include <tango/client/ApiUtil.h>

#include <tango/server/tango_config.h>

#include <tango/common/defines.h>



#include <sys/types.h>

src/client/ApiUtil.cpp

+1 −1
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 
#include <tango/client/DummyDeviceProxy.h>

#include <tango/client/NotifdEventConsumer.h>

#include <tango/client/ZmqEventConsumer.h>

#include <tango/common/defines.h>

#include <tango/server/ReaderLock.h>

#include <tango/server/tango_config.h>

#include <tango/server/Util.h>

#include <tango/server/WriterLock.h>

src/client/CallBackThread.cpp

+1 −1
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 
#include <tango/client/CallBackThread.h>



#include <tango/client/ApiUtil.h>

#include <tango/common/defines.h>

#include <tango/server/tango_clock.h>

#include <tango/server/tango_config.h>



#include <iostream>

src/client/Connection_asyn_cb.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <tango/client/DeviceAttribute.h>

#include <tango/client/DeviceProxy.h>

#include <tango/client/NamedDevFailedList.h>

#include <tango/server/tango_config.h>

#include <tango/common/defines.h>



#include <thread>