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.

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

[datalog] Fix sorting of related header #7832

Open
wants to merge 1 commit into
base: 2027
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions datalog/.styleguide
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,3 @@ includeOtherLibs {
^gtest/
^wpi/(?!datalog)
}

includeProject {
^wpi/datalog/
}
4 changes: 2 additions & 2 deletions datalog/src/main/native/cpp/DataLog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.

#include "wpi/datalog/DataLog.h"

#include <algorithm>
#include <bit>
#include <cstdio>
Expand All @@ -17,8 +19,6 @@
#include <wpi/print.h>
#include <wpi/timestamp.h>

#include "wpi/datalog/DataLog.h"

using namespace wpi::log;

static constexpr size_t kRecordMaxHeaderSize = 17;
Expand Down
3 changes: 2 additions & 1 deletion datalog/src/main/native/cpp/DataLogReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.

#include "wpi/datalog/DataLogReader.h"

#include <bit>
#include <utility>

#include <wpi/Endian.h>

#include "wpi/datalog/DataLog.h"
#include "wpi/datalog/DataLogReader.h"

using namespace wpi::log;

Expand Down
4 changes: 2 additions & 2 deletions datalog/src/main/native/cpp/DataLogReaderThread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.

#include "wpi/datalog/DataLogReaderThread.h"

#include <string>
#include <utility>

#include <wpi/StringExtras.h>
#include <wpi/print.h>

#include "wpi/datalog/DataLogReaderThread.h"

using namespace wpi::log;

DataLogReaderThread::~DataLogReaderThread() {
Expand Down
4 changes: 2 additions & 2 deletions datalog/src/main/native/cpp/DataLogWriter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.

#include "wpi/datalog/DataLogWriter.h"

#include <memory>
#include <utility>
#include <vector>

#include <wpi/raw_ostream.h>

#include "wpi/datalog/DataLogWriter.h"

using namespace wpi::log;

static std::unique_ptr<wpi::raw_ostream> CheckOpen(std::string_view filename,
Expand Down
4 changes: 2 additions & 2 deletions datalog/src/main/native/cpp/FileLogger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.

#include "wpi/datalog/FileLogger.h"

#ifdef __linux__
#include <fcntl.h>
#include <sys/inotify.h>
Expand All @@ -18,8 +20,6 @@
#include <fmt/format.h>
#include <wpi/StringExtras.h>

#include "wpi/datalog/FileLogger.h"

namespace wpi::log {
FileLogger::FileLogger(std::string_view file,
std::function<void(std::string_view)> callback)
Expand Down
Loading