Dedulicate make_unique
This also gets us off of the WPILib one which goes away for 2019.
Change-Id: I0436ce8fd477bbb27d9b0a7c4832dad01c9bad35
diff --git a/frc971/wpilib/ahal/BUILD b/frc971/wpilib/ahal/BUILD
index f643f57..f91b3fa 100644
--- a/frc971/wpilib/ahal/BUILD
+++ b/frc971/wpilib/ahal/BUILD
@@ -18,6 +18,7 @@
restricted_to = ["//tools:roborio"],
visibility = ["//third_party:__pkg__"],
deps = [
+ "//aos:make_unique",
"//aos/logging",
"//third_party:wpilib_hal",
],
diff --git a/frc971/wpilib/ahal/Base.h b/frc971/wpilib/ahal/Base.h
index 3a3d5a2..2d2e5a7 100644
--- a/frc971/wpilib/ahal/Base.h
+++ b/frc971/wpilib/ahal/Base.h
@@ -7,8 +7,6 @@
#pragma once
-#include "HAL/cpp/make_unique.h"
-
namespace frc {
// A struct to use as a deleter when a std::shared_ptr must wrap a raw pointer
diff --git a/frc971/wpilib/ahal/DriverStation.cc b/frc971/wpilib/ahal/DriverStation.cc
index f4c2e5d..c34db1b 100644
--- a/frc971/wpilib/ahal/DriverStation.cc
+++ b/frc971/wpilib/ahal/DriverStation.cc
@@ -12,6 +12,7 @@
#include "FRC_NetworkCommunication/FRCComm.h"
#include "HAL/HAL.h"
#include "HAL/Power.h"
+#include "aos/make_unique.h"
#include "frc971/wpilib/ahal/AnalogInput.h"
#include "frc971/wpilib/ahal/Utility.h"
#include "frc971/wpilib/ahal/WPIErrors.h"