linux compile fixes

This commit is contained in:
baldurk
2015-07-10 18:08:24 +02:00
parent 0cacba09ee
commit 1f5c8a450a
4 changed files with 6 additions and 6 deletions
+2 -1
View File
@@ -40,7 +40,8 @@
#include <QtWidgets>
#include "flowlayout.h"
#include "FlowLayout.h"
FlowLayout::FlowLayout(QWidget *parent, int margin, int hSpacing, int vSpacing)
: QLayout(parent), m_hSpace(hSpacing), m_vSpace(vSpacing)
{
-1
View File
@@ -186,7 +186,6 @@ void EventBrowser::on_timeDraws_clicked()
GUIInvoke::blockcall([this, results]() {
SetDrawcallTimes(ui->events->topLevelItem(0), results);
_CrtCheckMemory();
});
});
}
+2 -2
View File
@@ -60,8 +60,8 @@ typedef uint32_t bool32;
extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_FreeArrayMem(const void *mem);
typedef void (RENDERDOC_CC *pRENDERDOC_FreeArrayMem)(const void *mem);
extern "C" RENDERDOC_API void *RENDERDOC_CC RENDERDOC_AllocArrayMem(size_t sz);
typedef void *(RENDERDOC_CC *pRENDERDOC_AllocArrayMem)(size_t sz);
extern "C" RENDERDOC_API void *RENDERDOC_CC RENDERDOC_AllocArrayMem(uint64_t sz);
typedef void *(RENDERDOC_CC *pRENDERDOC_AllocArrayMem)(uint64_t sz);
#include "basic_types.h"
+2 -2
View File
@@ -384,9 +384,9 @@ void RENDERDOC_CC RENDERDOC_FreeArrayMem(const void *mem)
}
extern "C" RENDERDOC_API
void *RENDERDOC_CC RENDERDOC_AllocArrayMem(size_t sz)
void *RENDERDOC_CC RENDERDOC_AllocArrayMem(uint64_t sz)
{
return rdctype::array<char>::allocate(sz);
return rdctype::array<char>::allocate((size_t)sz);
}
extern "C" RENDERDOC_API