Removed unnecessary using namespace pros::c from cpp file.

purduesigbots · Sep 29, 2020 · cfd8e38 · cfd8e38
1 parent 7e73e49
commit cfd8e38
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/devices/vdml_distance.c b/src/devices/vdml_distance.c
@@ -16,36 +16,36 @@
 #include "vdml/registry.h"
 #include "vdml/vdml.h"
 
-#define ERROR_DISTANCE_BAD_PORT(port, err_return)                  \
-	if (vexDistanceStatusGet(port) == 0x82 || vexDistanceStatusGet(port) == 0x82) { \
+#define ERROR_DISTANCE_BAD_PORT(device, err_return)                  \
+	if (vexDistanceStatusGet(device->device_info) == 0x82 || vexDistanceStatusGet(device->device_info) == 0x82) { \
 		errno = EAGAIN;                                                            \
 		return_port(port - 1, err_return);                                         \
 	}
 
 int32_t distance_get(uint8_t port) {
 	claim_port_i(port - 1, E_DEVICE_DISTANCE);
-	ERROR_DISTANCE_BAD_PORT(port, PROS_ERR);
+	ERROR_DISTANCE_BAD_PORT(device, PROS_ERR);
 	int32_t rtn = vexDistanceDistanceGet(port - 1);
 	return_port(port - 1, rtn);
 }
 
 int32_t distance_get_confidence(uint8_t port) {
 	claim_port_i(port - 1, E_DEVICE_DISTANCE);
-	ERROR_DISTANCE_BAD_PORT(port, PROS_ERR);
+	ERROR_DISTANCE_BAD_PORT(device, PROS_ERR);
 	int32_t rtn = vexDistanceConfidenceGet(port - 1);
 	return_port(port - 1, rtn);
 }
 
 int32_t distance_get_object_size(uint8_t port){
 	claim_port_i(port - 1, E_DEVICE_DISTANCE);
-	ERROR_DISTANCE_BAD_PORT(port, PROS_ERR);
+	ERROR_DISTANCE_BAD_PORT(device, PROS_ERR);
 	int32_t rtn = vexDistanceObjectSizeGet(port - 1);
 	return_port(port - 1, rtn);
 }
 
 double distance_get_object_velocity(uint8_t port){
 	claim_port_i(port - 1, E_DEVICE_DISTANCE);
-	ERROR_DISTANCE_BAD_PORT(port, PROS_ERR);
+	ERROR_DISTANCE_BAD_PORT(device, PROS_ERR);
 	int32_t rtn = vexDistanceObjectVelocityGet(port - 1);
 	return_port(port - 1, rtn);
 }
diff --git a/src/devices/vdml_distance.cpp b/src/devices/vdml_distance.cpp
@@ -13,7 +13,6 @@
 #include "pros/distance.hpp"
 
 namespace pros {
-using namespace pros::c;
 
 Distance::Distance(const std::uint8_t port):_port(port){}