Skip to content

Commit

Permalink
wpiformat
Browse files Browse the repository at this point in the history
  • Loading branch information
DeltaDizzy committed Jan 7, 2025
1 parent 5be9084 commit 92897bb
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
3 changes: 2 additions & 1 deletion sysid/src/main/native/cpp/view/DataSelector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ static bool EmitEntryTarget(const char* name, bool isString,
if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload(
isString ? "DataLogEntryString" : "DataLogEntry")) {
assert(payload->DataSize == sizeof(const wpi::log::DataLogReaderEntry*));
*entry = *static_cast<const wpi::log::DataLogReaderEntry**>(payload->Data);
*entry =
*static_cast<const wpi::log::DataLogReaderEntry**>(payload->Data);
rv = true;
}
ImGui::EndDragDropTarget();
Expand Down
3 changes: 2 additions & 1 deletion sysid/src/main/native/cpp/view/LogLoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ void LogLoader::Display() {
return;
}
unload();
m_reader = std::make_unique<wpi::log::DataLogReaderThread>(std::move(reader));
m_reader =
std::make_unique<wpi::log::DataLogReaderThread>(std::move(reader));
m_entryTree.clear();
}
m_opener.reset();
Expand Down
6 changes: 3 additions & 3 deletions sysid/src/main/native/include/sysid/view/DataSelector.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ class Storage;
} // namespace glass

namespace wpi {
namespace log{
class DataLogReaderEntry;
}
namespace log {
class DataLogReaderEntry;
} // namespace log
class Logger;
} // namespace wpi

Expand Down
6 changes: 3 additions & 3 deletions sysid/src/main/native/include/sysid/view/LogLoader.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ class open_file;

namespace wpi {
namespace log {
class DataLogReaderEntry;
class DataLogReaderThread;
}
class DataLogReaderEntry;
class DataLogReaderThread;
} // namespace log
class Logger;
} // namespace wpi

Expand Down
2 changes: 1 addition & 1 deletion wpiutil/src/main/native/include/wpi/DataLogReaderThread.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,4 @@ class DataLogReaderThread {
std::thread m_thread;
};

} // namespace wpi
} // namespace wpi::log

0 comments on commit 92897bb

Please sign in to comment.