diff --git a/doxy_enet.py b/doxy_enet.py index 8248ca0..b841351 100644 --- a/doxy_enet.py +++ b/doxy_enet.py @@ -19,5 +19,15 @@ def create(target, module_name): 'ememory', #'algue' ]) + my_module.add_exclude_symbols([ + '*operator<<*', + ]) + my_module.add_exclude_file([ + 'debug.hpp', + ]) + my_module.add_file_patterns([ + '*.hpp', + '*.md', + ]) return my_module \ No newline at end of file diff --git a/enet/Ftp.cpp b/enet/Ftp.cpp index 791c2c8..af86859 100644 --- a/enet/Ftp.cpp +++ b/enet/Ftp.cpp @@ -6,4 +6,4 @@ #include #include -#include +#include diff --git a/enet/Http.cpp b/enet/Http.cpp index d99bb5b..9f75dfd 100644 --- a/enet/Http.cpp +++ b/enet/Http.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include static std::string escapeChar(const std::string& _value) { diff --git a/enet/Tcp.cpp b/enet/Tcp.cpp index 7e7a468..d34aa5e 100644 --- a/enet/Tcp.cpp +++ b/enet/Tcp.cpp @@ -6,11 +6,11 @@ #include #include -#include +#include #include -#include +#include #include -#include +#include #include #ifdef __TARGET_OS__Windows @@ -46,7 +46,7 @@ enet::Tcp::Tcp(int32_t _idSocket, const std::string& _name) : m_name(_name), m_status(status::link) { //Initialize the pollfd structure - memset(m_fds[0], 0 , sizeof(m_fds)); + memset(&m_fds[0], 0 , sizeof(m_fds)); //Set up the initial listening socket m_fds[0].fd = _idSocket; m_fds[0].events = POLLIN | POLLERR; @@ -60,7 +60,7 @@ enet::Tcp::Tcp(Tcp&& _obj) : _obj.m_name = ""; _obj.m_status = status::error; m_fds[0] = _obj.m_fds[0]; - memset(m_fds[0], 0 , sizeof(m_fds)); + memset(&m_fds[0], 0 , sizeof(m_fds)); } enet::Tcp::~Tcp() { @@ -76,7 +76,7 @@ enet::Tcp& enet::Tcp::operator = (enet::Tcp&& _obj) { m_status = _obj.m_status; _obj.m_status = status::error; m_fds[0] = _obj.m_fds[0]; - memset(m_fds[0], 0 , sizeof(m_fds)); + memset(&m_fds[0], 0 , sizeof(m_fds)); return *this; } diff --git a/enet/Tcp.hpp b/enet/Tcp.hpp index b94ab20..fcb867a 100644 --- a/enet/Tcp.hpp +++ b/enet/Tcp.hpp @@ -22,7 +22,7 @@ namespace enet { #else int32_t m_socketId; //!< socket linux interface generic #endif - #ifndef __TARGET_OS__Windows + #ifdef __TARGET_OS__Windows int32_t m_fds[1]; #else struct pollfd m_fds[1]; diff --git a/enet/TcpClient.cpp b/enet/TcpClient.cpp index eb6f65c..101ad70 100644 --- a/enet/TcpClient.cpp +++ b/enet/TcpClient.cpp @@ -10,9 +10,9 @@ #include #include #include -#include +#include #include -#include +#include #include #ifdef __TARGET_OS__Windows diff --git a/enet/TcpServer.cpp b/enet/TcpServer.cpp index 470a7c7..6a350ed 100644 --- a/enet/TcpServer.cpp +++ b/enet/TcpServer.cpp @@ -8,9 +8,9 @@ #include #include #include -#include +#include #include -#include +#include #include #ifdef __TARGET_OS__Windows diff --git a/enet/WebSocket.cpp b/enet/WebSocket.cpp index 6884177..41e5d2f 100644 --- a/enet/WebSocket.cpp +++ b/enet/WebSocket.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include