Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
A
ademco_hb
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
captainwong
ademco_hb
Commits
0bed63c8
Commit
0bed63c8
authored
Sep 03, 2020
by
captainwong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NOMINMAX
parent
d1b29132
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
24 additions
and
11 deletions
+24
-11
framework.h
examples/ademco_hb/framework.h
+4
-0
bench_client.cpp
examples/bench_client/bench_client.cpp
+3
-0
framework.h
examples/javademo/cpp/framework.h
+3
-0
server_demo.cpp
examples/server_demo/server_demo.cpp
+3
-0
server_demo_libevent.cpp
examples/server_demo_libevent/server_demo_libevent.cpp
+3
-0
ademco_detail.h
include/ademco_detail.h
+0
-8
ademco_event.h
include/ademco_event.h
+4
-0
ademco_packet.h
include/ademco_packet.h
+3
-2
hb_detail.h
include/hb_detail.h
+1
-1
No files found.
examples/ademco_hb/framework.h
View file @
0bed63c8
...
...
@@ -4,6 +4,10 @@
#define _CRT_SECURE_NO_WARNINGS
#endif
#ifndef NOMINMAX
#define NOMINMAX
#endif
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
// Windows Header Files
#include <windows.h>
...
...
examples/bench_client/bench_client.cpp
View file @
0bed63c8
...
...
@@ -11,6 +11,9 @@
# ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
# define _WINSOCK_DEPRECATED_NO_WARNINGS
# endif
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <WinSock2.h>
#pragma comment(lib, "ws2_32.lib")
#endif
...
...
examples/javademo/cpp/framework.h
View file @
0bed63c8
...
...
@@ -4,6 +4,9 @@
#ifndef _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_WARNINGS
#endif
#ifndef NOMINMAX
#define NOMINMAX
#endif
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
// Windows Header Files
#include <windows.h>
...
...
examples/server_demo/server_demo.cpp
View file @
0bed63c8
#ifdef _WIN32
#define _CRT_SECURE_NO_WARNINGS
#define _WINSOCK_DEPRECATED_NO_WARNINGS
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <WinSock2.h>
#pragma comment(lib, "ws2_32.lib")
#define ioctl ioctlsocket
...
...
examples/server_demo_libevent/server_demo_libevent.cpp
View file @
0bed63c8
...
...
@@ -6,6 +6,9 @@
# ifndef _CRT_SECURE_NO_WARNINGS
# define _CRT_SECURE_NO_WARNINGS
# endif
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <WinSock2.h>
#pragma comment(lib, "ws2_32.lib")
#endif
...
...
include/ademco_detail.h
View file @
0bed63c8
...
...
@@ -46,14 +46,6 @@ static inline int localtime_r(time_t* t, struct tm* tm_time) {
return
localtime_s
(
tm_time
,
t
);
}
#ifdef min
#undef min
#endif
#ifdef max
#undef max
#endif
#endif // __GNUG__
...
...
include/ademco_event.h
View file @
0bed63c8
...
...
@@ -4,6 +4,10 @@
#define _CRT_SECURE_NO_WARNINGS
#endif
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <stdint.h>
#ifdef ENABLE_ADEMCO_EVENT_TO_STRING
...
...
include/ademco_packet.h
View file @
0bed63c8
...
...
@@ -6,6 +6,7 @@
#include <string>
#include <memory>
#include <iterator>
#include <algorithm>
namespace
ademco
{
...
...
@@ -1234,8 +1235,8 @@ struct AdemcoPacket
}
// dump data
JLOG_HEX
(
pack
,
pack_len
);
JLOG_ASC
(
pack
,
pack_len
);
JLOG_HEX
(
pack
,
std
::
min
(
pack_len
,
4096u
)
);
JLOG_ASC
(
pack
,
std
::
min
(
pack_len
,
4096u
)
);
assert
(
0
);
return
ParseResult
::
RESULT_DATA_ERROR
;
...
...
include/hb_detail.h
View file @
0bed63c8
#
pragma
once
#include "ademco_packet.h"
#include <assert.h>
#include <stdint.h>
#include <string.h>
...
...
@@ -7,7 +8,6 @@
#include <string>
#include <type_traits>
#include <iterator>
#include "ademco_packet.h"
namespace
hb
{
...
...
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