From e42e8364112e97d89eeaecd13f043dff42179949 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 27 五月 2025 17:19:02 +0800
Subject: [PATCH] 1.enum修改为enum class, 理顺CLoadPort各成员变量在调度中的判定作用；
---
SourceCode/Bond/Servo/CJobDataA.cpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CJobDataA.cpp b/SourceCode/Bond/Servo/CJobDataA.cpp
index 4c5e3e4..cf33400 100644
--- a/SourceCode/Bond/Servo/CJobDataA.cpp
+++ b/SourceCode/Bond/Servo/CJobDataA.cpp
@@ -37,11 +37,11 @@
memcpy(&pszBuffer[index], &m_nPortNo, sizeof(short));
index += sizeof(short);
- int strLen = min(20, m_strCarrierId.size());
+ int strLen = min(20, (int)m_strCarrierId.size());
memcpy(&pszBuffer[index], m_strCarrierId.c_str(), strLen);
index += 20;
- strLen = min(20, m_pruductId.size());
+ strLen = min(20, (int)m_pruductId.size());
memcpy(&pszBuffer[index], m_pruductId.c_str(), strLen);
index += 20;
@@ -56,7 +56,7 @@
for (int i = 0; i < min(25, m_glassIds.size()); i++) {
std::string& strGlassId = m_glassIds.at(i);
- strLen = min(20, strGlassId.size());
+ strLen = min(20, (int)strGlassId.size());
memcpy(&pszBuffer[index], strGlassId.c_str(), strLen);
index += 20;
}
@@ -64,7 +64,7 @@
return 320 * 2;
}
- int CJobDataA::unserialize(char* pszBuffer, int nBufferSize)
+ int CJobDataA::unserialize(const char* pszBuffer, int nBufferSize)
{
if (nBufferSize < 640) return -1;
--
Gitblit v1.9.3