修改Windows平台编译问题

YDLIDAR · Dec 16, 2024 · cf0e391 · cf0e391
1 parent afbd189
commit cf0e391
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/core/common/ydlidar_help.h b/core/common/ydlidar_help.h
@@ -275,20 +275,15 @@ inline std::string lidarModelToString(int model)
     name = "TSA Pro";
     break;
   case DriverInterface::YDLIDAR_Tmini:
-    name = "Tmini";
-    break;
+    return "Tmini";
   case DriverInterface::YDLIDAR_TminiPro:
-    name = "Tmini Pro";
-    break;
+    return "Tmini Pro";
   case DriverInterface::YDLIDAR_TminiPlus:
-    name = "Tmini Plus";
-    break;
+    return "Tmini Plus";
   case DriverInterface::YDLIDAR_TminiPlusSH:
-    name = "Tmini Plus SH";
-    break;
+    return "Tmini Plus SH";
   case DriverInterface::YDLIDAR_T15:
-    name = "T15";
-    break;
+    return "T15";
   case DriverInterface::YDLIDAR_SDM15:
     return "SDM15";
   case DriverInterface::YDLIDAR_SDM18:

diff --git a/src/DTSLidarDriver.cpp b/src/DTSLidarDriver.cpp
@@ -1,4 +1,5 @@
 #include <math.h>
+#include <algorithm>
 #include "DTSLidarDriver.h"
 #include "core/serial/common.h"
 #include "ydlidar_config.h"

diff --git a/src/GSLidarDriver.cpp b/src/GSLidarDriver.cpp
@@ -33,6 +33,7 @@
 *********************************************************************/
 #include <math.h>
 #include <fstream>
+#include <algorithm>
 #include "GSLidarDriver.h"
 #include "core/serial/common.h"
 #include "core/serial/serial.h"

diff --git a/src/SDMLidarDriver.cpp b/src/SDMLidarDriver.cpp
@@ -32,6 +32,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  *********************************************************************/
 #include <math.h>
+#include <algorithm>
 #include "SDMLidarDriver.h"
 #include "core/serial/common.h"
 #include "ydlidar_config.h"

diff --git a/src/TiaLidarDriver.cpp b/src/TiaLidarDriver.cpp
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <errno.h>
+#include <algorithm>
 #include "core/network/PassiveSocket.h"
 #include "core/network/SimpleSocket.h"
 #include "core/serial/common.h"

diff --git a/src/YDlidarDriver.cpp b/src/YDlidarDriver.cpp
@@ -22,6 +22,7 @@
 // SOFTWARE.
 //
 #include <math.h>
+#include <algorithm>
 #include "core/common/ydlidar_help.h"
 #include "core/serial/common.h"
 #include "core/serial/serial.h"
@@ -2778,7 +2779,7 @@ bool YDlidarDriver::getPitchAngle(float& pitch)
   ret = sendCommand(LIDAR_CMD_GETPITCH);
   if (!IS_OK(ret))
     return false;
-  u_int32_t timeout = TIMEOUT_300;
+  uint32_t timeout = TIMEOUT_300;
   uint32_t st = getms();
   uint32_t wt = 0;
   while ((wt = getms() - st) <= timeout)