Skip to content
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
6 changes: 3 additions & 3 deletions src/analysis/CANFrameAnalysis.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "CANDatabaseAnalysis.h"
#include "CANDatabase.h"
#include <cpp-can-parser/CANDatabaseAnalysis.h>
#include <cpp-can-parser/CANDatabase.h>
#include <algorithm>
#include <cmath>
#include <tuple>
Expand Down Expand Up @@ -191,4 +191,4 @@ void CppCAN::analysis::assert_frame_layout(const CANFrame& src) {
std::string text = "assert_frame_layout() failed for frame \"" + src.name() + "\"";
throw CANDatabaseException(text);
}
}
}
2 changes: 1 addition & 1 deletion src/models/CANDatabase.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "CANDatabase.h"
#include <cpp-can-parser/CANDatabase.h>
#include "DBCParser.h"
#include <utility>
#include <iostream>
Expand Down
4 changes: 2 additions & 2 deletions src/models/CANFrame.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "CANDatabase.h"
#include <cpp-can-parser/CANDatabase.h>
#include <utility>
#include <iostream>

Expand Down Expand Up @@ -147,4 +147,4 @@ void CppCAN::swap(CANFrame & first, CANFrame & second) {
std::swap(first.period_, second.period_);
std::swap(first.map_, second.map_);
std::swap(first.comment_, second.comment_);
}
}
2 changes: 1 addition & 1 deletion src/models/CANSignal.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "CANDatabase.h"
#include <cpp-can-parser/CANDatabase.h>

using namespace CppCAN;

Expand Down
4 changes: 2 additions & 2 deletions src/parsing/DBCParser.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef DBCParser_H
#define DBCParser_H

#include "CANDatabase.h"
#include "Tokenizer.h"
#include <cpp-can-parser/CANDatabase.h>
#include <Tokenizer.h>
#include <set>
#include <memory>

Expand Down
2 changes: 1 addition & 1 deletion src/parsing/ParsingUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <iostream>

#include "Tokenizer.h"
#include "CANDatabase.h"
#include <cpp-can-parser/CANDatabase.h>

namespace CppCAN {
namespace parser {
Expand Down
4 changes: 2 additions & 2 deletions src/parsing/Tokenizer.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "Tokenizer.h"
#include "CANDatabase.h"
#include <cpp-can-parser/CANDatabase.h>
#include <cctype>
#include <iostream>

Expand Down Expand Up @@ -337,4 +337,4 @@ char StringTokenizer::doGetNextChar() {
}

return result;
}
}
4 changes: 2 additions & 2 deletions tests/test-parsing.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <iostream>
#include "CANDatabase.h"
#include <cpp-can-parser/CANDatabase.h>

int main(int argc, char** argv) {
using namespace CppCAN;
Expand Down Expand Up @@ -40,4 +40,4 @@ int main(int argc, char** argv) {
}

return static_cast<int>(errors.size() != 0);
}
}