libAthena
/
athena
mirror of https://github.com/libAthena/athena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DNA fixes

This commit is contained in:
Phillip Stephens 2019-08-26 18:00:30 -07:00
parent 3f9177be15
commit 276db8ea56
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
atdna/main.cpp
View File

@ -184,22 +184,22 @@ class ATDNAEmitVisitor : public clang::RecursiveASTVisitor<ATDNAEmitVisitor> {
static std::string GetOpString(const std::string& fieldName, const std::string& propIdExpr, static std::string GetOpString(const std::string& fieldName, const std::string& propIdExpr,
const std::string& endianExpr) { const std::string& endianExpr) {
return "<Op, "s + endianExpr + ">({" + propIdExpr + "}, " + fieldName + ", s)"; return "<Op, "s + endianExpr + ">(athena::io::PropId(" + propIdExpr + "), " + fieldName + ", s)";
} }
static std::string GetOpString(const std::string& fieldName, const std::string& propIdExpr) { static std::string GetOpString(const std::string& fieldName, const std::string& propIdExpr) {
return "<Op>({" + propIdExpr + "}, " + fieldName + ", s)"; return "<Op>(athena::io::PropId(" + propIdExpr + "), " + fieldName + ", s)";
} }
static std::string GetVectorOpString(const std::string& fieldName, const std::string& propIdExpr, static std::string GetVectorOpString(const std::string& fieldName, const std::string& propIdExpr,
const std::string& sizeExpr, const std::string& endianExpr) { const std::string& sizeExpr, const std::string& endianExpr) {
return "<Op, "s + endianExpr + ">({" + propIdExpr + "}, " + fieldName + ", " + sizeExpr + ", s)"; return "<Op, "s + endianExpr + ">(athena::io::PropId(" + propIdExpr + "), " + fieldName + ", " + sizeExpr + ", s)";
} }
static std::string GetVectorOpString(const std::string& fieldName, const std::string& propIdExpr, static std::string GetVectorOpString(const std::string& fieldName, const std::string& propIdExpr,
const std::string& sizeExpr) { const std::string& sizeExpr) {
return "<Op>({" + propIdExpr + "}, " + fieldName + ", " + sizeExpr + ", s)"; return "<Op>(athena::io::PropId(" + propIdExpr + "), " + fieldName + ", " + sizeExpr + ", s)";
} }
static void RecurseNestedTypeName(const clang::DeclContext* decl, std::string& templateStmt, std::string& qualType) { static void RecurseNestedTypeName(const clang::DeclContext* decl, std::string& templateStmt, std::string& qualType) {

1
src/athena/Socket.cpp
View File

@ -9,6 +9,7 @@
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h>
#else #else
#include <WinSock2.h> #include <WinSock2.h>
#include <Ws2tcpip.h> #include <Ws2tcpip.h>