summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMirko Scholz <mirko@mizar>2015-01-22 21:26:15 (GMT)
committerMirko Scholz <mirko@mizar>2015-01-22 21:26:15 (GMT)
commit72ad7fb9b1a93537d445888c6034c1118fd4686c (patch)
treee4b1d70f3aeba518ef6c8760a3b43aa8e8ea9da8
parentaf05b3b35914b7dd84b4a32400664381f74ec300 (diff)
downloadcv2pdb-72ad7fb9b1a93537d445888c6034c1118fd4686c.zip
cv2pdb-72ad7fb9b1a93537d445888c6034c1118fd4686c.tar.gz
cv2pdb-72ad7fb9b1a93537d445888c6034c1118fd4686c.tar.bz2
Build with Visual Studio 10 Compiler (Windows SDK 7.1)
-rw-r--r--src/mspdb.cpp2
-rw-r--r--src/mspdb.h4
-rw-r--r--src/readDwarf.cpp2
-rw-r--r--src/readDwarf.h1
4 files changed, 5 insertions, 4 deletions
diff --git a/src/mspdb.cpp b/src/mspdb.cpp
index d4b01d8..d951940 100644
--- a/src/mspdb.cpp
+++ b/src/mspdb.cpp
@@ -187,7 +187,7 @@ mspdb::PDB* CreatePDB(const wchar_t* pdbname)
mspdb::PDB* pdb = 0;
long data[194] = { 193, 0 };
wchar_t ext[256] = L".exe";
- if (!(*pPDBOpen2W) (pdbname, "wf", data, ext, 0x400, &pdb))
+ if (!((*pPDBOpen2W) (pdbname, "wf", data, ext, 0x400, &pdb)))
return 0;
return pdb;
diff --git a/src/mspdb.h b/src/mspdb.h
index 9c48342..a8883e0 100644
--- a/src/mspdb.h
+++ b/src/mspdb.h
@@ -199,8 +199,8 @@ public: virtual void MRECmp::structIsBoring(unsigned long);
//public: virtual void * Pool<65536>::AllocBytes(unsigned int);
//public: virtual void EnumSyms::get(unsigned char * *);
-typedef int __cdecl fnPDBOpen2W(unsigned short const *path,char const *mode,long *p,
- unsigned short *ext,unsigned int flags,struct PDB **pPDB);
+typedef int __cdecl fnPDBOpen2W(const wchar_t *path,char const *mode,long *p,
+ wchar_t *ext,unsigned int flags,struct PDB **pPDB);
struct PDB_part1 {
public: virtual unsigned long QueryInterfaceVersion(void);
diff --git a/src/readDwarf.cpp b/src/readDwarf.cpp
index 5e6faeb..42af041 100644
--- a/src/readDwarf.cpp
+++ b/src/readDwarf.cpp
@@ -289,7 +289,7 @@ namespace std
template<typename T1, typename T2>
struct hash<std::pair<T1, T2>>
{
- size_t operator()(const std::pair<T1, T2>& t)
+ size_t operator()(const std::pair<T1, T2>& t) const
{
return std::hash<T1>()(t.first) ^ std::hash<T2>()(t.second);
}
diff --git a/src/readDwarf.h b/src/readDwarf.h
index 35daa8e..637a6ec 100644
--- a/src/readDwarf.h
+++ b/src/readDwarf.h
@@ -1,6 +1,7 @@
#ifndef __READDWARF_H__
#define __READDWARF_H__
+#include <cstring>
#include <string>
#include <vector>
#include "mspdb.h"