JDWP compile fixes for linux

This commit is contained in:
baldurk
2018-04-25 20:49:13 +01:00
parent becfe157b4
commit ae454edb03
3 changed files with 6 additions and 8 deletions
+1 -1
View File
@@ -322,7 +322,7 @@ bool InjectLibraries(const std::string &deviceID, Network::Socket *sock)
thread = 0;
Event evData = conn.WaitForEvent(
EventKind::MethodEntry, {{ModifierKind::ClassOnly, thisClass.Object}},
EventKind::MethodEntry, {{ModifierKind::ClassOnly, thisClass.RefType}},
[onCreate](const Event &evData) { return evData.MethodEntry.location.methodID == onCreate; });
if(evData.eventKind == EventKind::MethodEntry)
+5 -2
View File
@@ -227,7 +227,7 @@ enum class IDType
frame
};
template <IDType>
template <IDType t>
struct jdwpID
{
public:
@@ -238,7 +238,7 @@ public:
static void setSize(int32_t s)
{
RDCASSERT(s == 4 || s == 8);
size = s;
jdwpID<t>::size = s;
}
void EndianSwap()
@@ -277,6 +277,9 @@ typedef jdwpID<IDType::method> methodID;
typedef jdwpID<IDType::field> fieldID;
typedef jdwpID<IDType::frame> frameID;
template <IDType t>
int32_t jdwpID<t>::size = 8;
struct taggedObjectID
{
Tag tag;
-5
View File
@@ -32,11 +32,6 @@
namespace JDWP
{
uint32_t Command::idalloc = 42;
int32_t objectID::size = 8;
int32_t referenceTypeID::size = 8;
int32_t methodID::size = 8;
int32_t fieldID::size = 8;
int32_t frameID::size = 8;
uint32_t Command::Send(StreamWriter &writer)
{