Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[new-core-alignment] service includes cleaned up #1358

Merged
merged 1 commit into from
Feb 12, 2024
Merged

[new-core-alignment] service includes cleaned up #1358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ecal/service/ecal_service/include/ecal/service/client_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,14 @@

#pragma once

#include <memory>
#include <cstddef>
#include <cstdint>
#include <map>
#include <memory>

#include <ecal/service/client_session.h>
#include <mutex>
#include <string>

namespace eCAL
{
Expand Down
3 changes: 3 additions & 0 deletions ecal/service/ecal_service/include/ecal/service/client_session.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@

#pragma once

#include <cstdint>
#include <functional>
#include <memory>
#include <string>

#ifdef _MSC_VER
#pragma warning(push)
Expand Down
2 changes: 2 additions & 0 deletions ecal/service/ecal_service/include/ecal/service/server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

#pragma once

#include <cstdint>
#include <functional>
#include <memory>

#include <asio.hpp>
Expand Down
5 changes: 4 additions & 1 deletion ecal/service/ecal_service/include/ecal/service/server_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,13 @@

#pragma once

#include <memory>
#include <cstddef>
#include <cstdint>
#include <map>
#include <memory>

#include <ecal/service/server.h>
#include <mutex>

namespace eCAL
{
Expand Down
6 changes: 6 additions & 0 deletions ecal/service/ecal_service/src/client_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,13 @@
* ========================= eCAL LICENSE =================================
*/

#include <cstddef>
#include <cstdint>
#include <ecal/service/client_manager.h>
#include <map>
#include <memory>
#include <mutex>
#include <string>

namespace eCAL
{
Expand Down
4 changes: 4 additions & 0 deletions ecal/service/ecal_service/src/client_session.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@
* ========================= eCAL LICENSE =================================
*/

#include <cstdint>
#include <ecal/service/client_session.h>
#include <memory>
#include <mutex>
#include <string>

#include "client_session_impl_v1.h"
#include "client_session_impl_v0.h"
Expand Down
4 changes: 4 additions & 0 deletions ecal/service/ecal_service/src/client_session_impl_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@

#pragma once

#include <cstdint>
#include <memory>
#include <mutex>
#include <string>
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable: 4834)
Expand Down
6 changes: 6 additions & 0 deletions ecal/service/ecal_service/src/client_session_impl_v0.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@
#include "log_helpers.h"
#include "log_defs.h"

#include <cstddef>
#include <cstdint>
#include <iostream>
#include <memory>
#include <mutex>
#include <string>
#include <vector>

namespace eCAL
{
Expand Down
3 changes: 3 additions & 0 deletions ecal/service/ecal_service/src/client_session_impl_v0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,13 @@
#pragma once

#include "client_session_impl_base.h"
#include <cstdint>
#include <ecal/service/logger.h>

#include <deque>
#include <memory>
#include <mutex>
#include <string>

namespace eCAL
{
Expand Down
7 changes: 7 additions & 0 deletions ecal/service/ecal_service/src/client_session_impl_v1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,14 @@
#include "log_helpers.h"
#include "log_defs.h"

#include <cstddef>
#include <cstdint>
#include <iostream>
#include <memory>
#include <mutex>
#include <string>
#include <utility>
#include <vector>

namespace eCAL
{
Expand Down
4 changes: 4 additions & 0 deletions ecal/service/ecal_service/src/client_session_impl_v1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,14 @@
#pragma once

#include "client_session_impl_base.h"
#include <atomic>
#include <cstdint>
#include <ecal/service/logger.h>

#include <deque>
#include <memory>
#include <mutex>
#include <string>

namespace eCAL
{
Expand Down
1 change: 1 addition & 0 deletions ecal/service/ecal_service/src/log_helpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#pragma once

#include <asio.hpp>
#include <string>

namespace eCAL
{
Expand Down
5 changes: 5 additions & 0 deletions ecal/service/ecal_service/src/protocol_v0.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@
#include "protocol_v0.h"

#include "protocol_layout.h"
#include <cstddef>
#include <cstdint>
#include <memory>
#include <mutex>
#include <string>

namespace eCAL
{
Expand Down
5 changes: 2 additions & 3 deletions ecal/service/ecal_service/src/protocol_v0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@

#pragma once

#include <memory>
#include <string>
#include <vector>
#include <functional>
#include <memory>
#include <mutex>
#include <string>

#include <asio.hpp>

Expand Down
6 changes: 6 additions & 0 deletions ecal/service/ecal_service/src/protocol_v1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@
#include "protocol_v1.h"

#include "protocol_layout.h"
#include <cstddef>
#include <cstdint>
#include <memory>
#include <mutex>
#include <string>
#include <vector>

namespace eCAL
{
Expand Down
2 changes: 2 additions & 0 deletions ecal/service/ecal_service/src/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@
* ========================= eCAL LICENSE =================================
*/

#include <cstdint>
#include <ecal/service/server.h>

#include <algorithm>
#include <memory>

#include "server_impl.h"

Expand Down
3 changes: 3 additions & 0 deletions ecal/service/ecal_service/src/server_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
#include "server_impl.h"

#include <algorithm>
#include <cstdint>
#include <memory>
#include <mutex>

#include "server_session_impl_v1.h"
#include "server_session_impl_v0.h"
Expand Down
6 changes: 4 additions & 2 deletions ecal/service/ecal_service/src/server_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@

#pragma once

#include <atomic>
#include <cstdint>
#include <functional>
#include <string>
#include <memory>
#include <atomic>
#include <mutex>
#include <string>
#include <vector>

#ifdef _MSC_VER
#pragma warning(push)
Expand Down
5 changes: 5 additions & 0 deletions ecal/service/ecal_service/src/server_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@
* ========================= eCAL LICENSE =================================
*/

#include <cstddef>
#include <cstdint>
#include <ecal/service/server_manager.h>
#include <map>
#include <memory>
#include <mutex>

namespace eCAL
{
Expand Down
2 changes: 1 addition & 1 deletion ecal/service/ecal_service/src/server_session_impl_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <memory>
#include <functional>

#include <string>
#include <mutex>
#include <sstream>

#ifdef _MSC_VER
Expand Down
6 changes: 6 additions & 0 deletions ecal/service/ecal_service/src/server_session_impl_v0.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
#include "log_defs.h"

#include "protocol_layout.h"
#include <cstddef>
#include <cstdint>
#include <memory>
#include <mutex>
#include <string>
#include <vector>

///////////////////////////////////////////////
// Create, Constructor, Destructor
Expand Down
4 changes: 4 additions & 0 deletions ecal/service/ecal_service/src/server_session_impl_v0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,14 @@
#pragma once

#include "server_session_impl_base.h"
#include <atomic>
#include <cstddef>
#include <ecal/service/logger.h>
#include <ecal/service/server_session_types.h>

#include <ecal/service/state.h>
#include <memory>
#include <string>

namespace eCAL
{
Expand Down
8 changes: 7 additions & 1 deletion ecal/service/ecal_service/src/server_session_impl_v1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,14 @@

#include "protocol_v1.h"

#include "log_helpers.h"
#include "log_defs.h"
#include "log_helpers.h"
#include <algorithm>
#include <cstdint>
#include <memory>
#include <mutex>
#include <string>
#include <vector>

///////////////////////////////////////////////
// Create, Constructor, Destructor
Expand Down
4 changes: 4 additions & 0 deletions ecal/service/ecal_service/src/server_session_impl_v1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,14 @@
#pragma once

#include "server_session_impl_base.h"
#include <atomic>
#include <cstdint>
#include <ecal/service/logger.h>
#include <ecal/service/server_session_types.h>

#include <ecal/service/state.h>
#include <memory>
#include <string>

namespace eCAL
{
Expand Down
5 changes: 3 additions & 2 deletions ecal/service/test/src/ecal_tcp_service_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@

#include <asio.hpp>

#include <iostream>
#include <atomic>
#include <thread>
#include <chrono>
#include <iostream>
#include <string>
#include <thread>

#include <ecal/service/server.h> // Should not be needed, when I use the server manager / client manager
#include <ecal/service/client_session.h> // Should not be needed, when I use the server manager / client manager
Expand Down
Loading