Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 07:51:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

another hack attempt to fix unit tests on windows

Browse source
This commit is contained in:
ZappoMan 2014-06-24 20:10:06 -07:00
parent 1001ea5f87
commit fd3916e662
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/models/src/ModelItem.h
View file

@ -12,11 +12,7 @@
#ifndef hifi_ModelItem_h #ifndef hifi_ModelItem_h
#define hifi_ModelItem_h #define hifi_ModelItem_h
#include <cstring> // ???
#include <stddef.h>
#include <stdio.h> // for ssize_t
#include <stdint.h> #include <stdint.h>
#include <stdlib.h>
#include <glm/glm.hpp> #include <glm/glm.hpp>
@ -27,15 +23,8 @@
#include <CollisionInfo.h> #include <CollisionInfo.h>
#include <SharedUtil.h> #include <SharedUtil.h>
#include <OctreePacketData.h> #include <OctreePacketData.h>
#include <OctreeEditPacketSender.h>
//#include <assert.h>
//#include <PerfStat.h>
#include <OctalCode.h>
#include <PacketHeaders.h>
//#include "ModelEditPacketSender.h"
class ModelItem; class ModelItem;
class ModelEditPacketSender; class ModelEditPacketSender;
class ModelItemProperties; class ModelItemProperties;

11
tests/octree/src/ModelTests.cpp
View file

@ -14,7 +14,13 @@
#include <QDebug> #include <QDebug>
#if 1 #ifdef WIN32
#ifndef ssize_t
#define ssize_t int
#endif
#endif
#include <Octree.h> #include <Octree.h>
#include <ModelItem.h> #include <ModelItem.h>
#include <ModelTree.h> #include <ModelTree.h>
@ -22,12 +28,10 @@
#include <OctreeConstants.h> #include <OctreeConstants.h>
#include <PropertyFlags.h> #include <PropertyFlags.h>
#include <SharedUtil.h> #include <SharedUtil.h>
#endif
#include "ModelTests.h" #include "ModelTests.h"
void ModelTests::modelTreeTests(bool verbose) { void ModelTests::modelTreeTests(bool verbose) {
#if 1
int testsTaken = 0; int testsTaken = 0;
int testsPassed = 0; int testsPassed = 0;
int testsFailed = 0; int testsFailed = 0;
@ -258,7 +262,6 @@ void ModelTests::modelTreeTests(bool verbose) {
if (verbose) { if (verbose) {
qDebug() << "******************************************************************************************"; qDebug() << "******************************************************************************************";
} }
#endif
} }