From 1c8fb298b47ec1669c4c0d3ad80563b432b06a12 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Sat, 19 Nov 2016 00:39:32 -0800 Subject: [PATCH] Ran formatter (#354) --- wpilibc/athena/include/CameraServer.h | 7 +++++-- wpilibc/athena/src/CameraServer.cpp | 4 ++-- .../athena/java/edu/wpi/first/wpilibj/CameraServer.java | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/wpilibc/athena/include/CameraServer.h b/wpilibc/athena/include/CameraServer.h index f0dae65317..d413ad232c 100644 --- a/wpilibc/athena/include/CameraServer.h +++ b/wpilibc/athena/include/CameraServer.h @@ -7,13 +7,16 @@ #pragma once +#include #include +#include +#include -#include "cscore.h" #include "ErrorBase.h" +#include "cscore.h" #include "llvm/DenseMap.h" -#include "llvm/StringRef.h" #include "llvm/StringMap.h" +#include "llvm/StringRef.h" #include "networktables/NetworkTable.h" namespace frc { diff --git a/wpilibc/athena/src/CameraServer.cpp b/wpilibc/athena/src/CameraServer.cpp index 808a2863ab..352a730aa8 100644 --- a/wpilibc/athena/src/CameraServer.cpp +++ b/wpilibc/athena/src/CameraServer.cpp @@ -7,10 +7,10 @@ #include "CameraServer.h" -#include "llvm/SmallString.h" -#include "llvm/raw_ostream.h" #include "Utility.h" #include "WPIErrors.h" +#include "llvm/SmallString.h" +#include "llvm/raw_ostream.h" using namespace frc; diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/CameraServer.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/CameraServer.java index acc1a880e4..ae54319012 100644 --- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/CameraServer.java +++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/CameraServer.java @@ -232,7 +232,7 @@ public class CameraServer { String relativeKey = key.substring(kPublishName.length()); }, ITable.NOTIFY_IMMEDIATE | ITable.NOTIFY_UPDATE); - + } /**