diff --git a/.github/workflows/lint-format.yml b/.github/workflows/lint-format.yml index f496f3abac..366bfab343 100644 --- a/.github/workflows/lint-format.yml +++ b/.github/workflows/lint-format.yml @@ -36,12 +36,8 @@ jobs: git fetch --prune --unshallow git checkout -b pr git branch -f main origin/main - - name: Set up Python 3.8 - uses: actions/setup-python@v2 - with: - python-version: 3.8 - name: Install clang-format and clang-tidy - run: sudo apt-get update -q && sudo apt-get install -y clang-format-10 clang-tidy-10 + run: sudo apt-get update -q && sudo apt-get install -y clang-format-10 clang-tidy-10 python3.8 - name: Install wpiformat run: pip3 install wpiformat - name: Create compile_commands.json diff --git a/glass/src/libnt/native/cpp/NTField2D.cpp b/glass/src/libnt/native/cpp/NTField2D.cpp index 47fcf2fb23..073aff9b8f 100644 --- a/glass/src/libnt/native/cpp/NTField2D.cpp +++ b/glass/src/libnt/native/cpp/NTField2D.cpp @@ -213,11 +213,11 @@ void NTField2DModel::Update() { if (name.empty() || name[0] == '.') { continue; } - auto it = std::lower_bound(m_groups.begin(), m_groups.end(), name, + auto it = std::lower_bound(m_groups.begin(), m_groups.end(), event.name, [](const auto& e, wpi::StringRef name) { return e->GetName() < name; }); - bool match = (it != m_groups.end() && (*it)->GetName() == name); + bool match = (it != m_groups.end() && (*it)->GetName() == event.name); if (event.flags & NT_NOTIFY_DELETE) { if (match) { m_groups.erase(it); diff --git a/wpiutil/src/main/native/include/wpi/Format.h b/wpiutil/src/main/native/include/wpi/Format.h index cb8b26b809..ac4886a110 100644 --- a/wpiutil/src/main/native/include/wpi/Format.h +++ b/wpiutil/src/main/native/include/wpi/Format.h @@ -95,7 +95,7 @@ class format_object final : public format_object_base { int snprint_tuple(char *Buffer, unsigned BufferSize, std::index_sequence) const { #ifdef _MSC_VER - return _snprintf_s(Buffer, BufferSize, BufferSize, Fmt, std::get(Vals)...); + return _snprintf(Buffer, BufferSize, Fmt, std::get(Vals)...); #else #ifdef __GNUC__ #pragma GCC diagnostic push