Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
49499169
Commit
49499169
authored
Jul 27, 2016
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Мелкие корректировки по используемым типам
parent
511b39b6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
UDPPacket.h
extensions/UNetUDP/UDPPacket.h
+2
-3
ModbusServer.h
include/modbus/ModbusServer.h
+1
-1
No files found.
extensions/UNetUDP/UDPPacket.h
View file @
49499169
...
@@ -37,17 +37,16 @@ namespace UniSetUDP
...
@@ -37,17 +37,16 @@ namespace UniSetUDP
т.к. это не сильно актуально, пока не переделываю.
т.к. это не сильно актуально, пока не переделываю.
*/
*/
const
u
nsigned
in
t
UNETUDP_MAGICNUM
=
0x1337A1D
;
// идентификатор протокола
const
u
int32_
t
UNETUDP_MAGICNUM
=
0x1337A1D
;
// идентификатор протокола
struct
UDPHeader
struct
UDPHeader
{
{
UDPHeader
()
:
magic
(
UNETUDP_MAGICNUM
),
num
(
0
),
nodeID
(
0
),
procID
(
0
),
dcount
(
0
),
acount
(
0
)
{}
UDPHeader
()
:
magic
(
UNETUDP_MAGICNUM
),
num
(
0
),
nodeID
(
0
),
procID
(
0
),
dcount
(
0
),
acount
(
0
)
{}
u
nsigned
in
t
magic
;
u
int32_
t
magic
;
size_t
num
;
size_t
num
;
long
nodeID
;
long
nodeID
;
long
procID
;
long
procID
;
//!\todo может лучше использовать системно-независимый unsigned long, чем size_t?
size_t
dcount
;
/*!< количество булевых величин */
size_t
dcount
;
/*!< количество булевых величин */
size_t
acount
;
/*!< количество аналоговых величин */
size_t
acount
;
/*!< количество аналоговых величин */
...
...
include/modbus/ModbusServer.h
View file @
49499169
...
@@ -21,7 +21,7 @@ namespace std
...
@@ -21,7 +21,7 @@ namespace std
public
:
public
:
size_t
operator
()(
const
ModbusRTU
::
mbErrCode
&
e
)
const
size_t
operator
()(
const
ModbusRTU
::
mbErrCode
&
e
)
const
{
{
return
std
::
hash
<
in
t
>
()(
e
);
return
std
::
hash
<
size_
t
>
()(
e
);
}
}
};
};
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment