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

Jump to bottom

[mma] cleaned includes #1372

Merged
merged 3 commits into from
Feb 16, 2024
Merged

[mma] cleaned includes #1372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ddb0efa
Added many missing includes
FlorianReimold Feb 15, 2024
ac42995
Fixed most mma includes. Also removed unused includes.
FlorianReimold Feb 15, 2024
a7bd10c
Fixed clang tidy warnings
FlorianReimold Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions contrib/mma/include/linux/mma_linux.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
* ========================= eCAL LICENSE =================================
*/

#include <cstdint>
#include <list>
#include <map>
#include <sys/types.h>
#include <unordered_map>
#include <vector>
#ifdef __unix__

#include <mutex>
Expand Down
2 changes: 1 addition & 1 deletion contrib/mma/include/linux/pipe_refresher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@

#pragma once

#include <cstdint>
#ifdef __unix__

#include <atomic>
#include <functional>
#include <mutex>
#include <string>
#include <thread>

Expand Down
2 changes: 0 additions & 2 deletions contrib/mma/include/logger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@

#pragma once

#include <ctime>
#include <fstream>
#include <iostream>
#include <string>

class Logger
Expand Down
11 changes: 11 additions & 0 deletions contrib/mma/src/linux/mma_linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@
* ========================= eCAL LICENSE =================================
*/

#include "ecal/app/pb/mma/mma.pb.h"
#include "linux/pipe_refresher.h"
#include "linux/ressource.h"
#include <cstddef>
#include <cstdint>
#include <cstdio>
#include <cstring>
#include <iterator>
#include <memory>
#include <mutex>
#include <utility>
#ifdef __unix__

#include <functional>
Expand Down
6 changes: 5 additions & 1 deletion contrib/mma/src/linux/pipe_refresher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,14 @@
* ========================= eCAL LICENSE =================================
*/

#include <chrono>
#include <cstdint>
#include <cstdio>
#include <string>
#include <thread>
#ifdef __unix__

#include <string.h>
#include <iostream>

#include "../include/linux/pipe_refresher.h"

Expand Down
4 changes: 4 additions & 0 deletions contrib/mma/src/logger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@

#include "../include/logger.h"

#include <ctime>
#include <fstream>
#include <ios>
#include <string.h>
#include <string>

Logger* Logger::this_ = nullptr;
std::ofstream Logger::log_file_;
Expand Down
1 change: 1 addition & 0 deletions contrib/mma/src/mma.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/

#include "../include/mma.h"
#include "ecal/app/pb/mma/mma.pb.h"

#ifdef _WIN32
#include "../include/windows/mma_windows.h"
Expand Down
10 changes: 2 additions & 8 deletions contrib/mma/src/mma_application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include <atomic>
#include <chrono>
#include <functional>
#include <cstring>
#include <iostream>
#include <string>
#include <thread>
Expand All @@ -32,11 +32,10 @@
#include "../include/mma.h"
#include "../include/mma_defs.h"
#include "../include/zombie_instance_killer.h"
#include "../include/interruptable_timer.h"

#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable: 4100 4127 4146 4505 4800 4189 4592) // disable proto warnings
#pragma warning(disable : 4100 4127 4146 4505 4800 4189 4592) // disable proto warnings
#endif
#include <ecal/app/pb/mma/mma.pb.h>
#ifdef _MSC_VER
Expand All @@ -49,17 +48,12 @@
#include <direct.h>
#include <TlHelp32.h>
#else
#include <csignal>
#include <cstdlib>
#include <errno.h>
#include <fcntl.h>
#include <iostream>
#include <list>
#include <stdio.h>
#include <string>
#include <sys/ioctl.h>
#include <sys/select.h>
#include <sys/types.h>
#include <termios.h>
#include <unistd.h>

Expand Down
1 change: 1 addition & 0 deletions contrib/mma/src/query_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/

#include "../include/query_manager.h"
#include <string>

QueryManager::QueryManager()
{
Expand Down
3 changes: 2 additions & 1 deletion contrib/mma/src/zombie_instance_killer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
* ========================= eCAL LICENSE =================================
*/

#include <cstdio>
#include <cstdlib>
#include <iostream>
#include <list>
#include <string>
Expand All @@ -29,7 +31,6 @@
#endif

#ifdef __linux__
#include <csignal>
#include <string.h>
#include <sys/types.h>
#include <unistd.h>
Expand Down