Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Suppress TBB warnings

Browse source
This commit is contained in:
Bradley Austin Davis 2017-06-06 13:55:24 -07:00
parent fc6a278217
commit b4bbf98fe3
8 changed files with 36 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/audio/AudioMixerSlavePool.h
View file

@ -16,10 +16,10 @@
#include <mutex>
#include <vector>
#include <tbb/concurrent_queue.h>
#include <QThread>
#include <TBBHelpers.h>
#include "AudioMixerSlave.h"
class AudioMixerSlavePool;

3
assignment-client/src/avatars/AvatarMixerSlavePool.h
View file

@ -16,10 +16,9 @@
#include <mutex>
#include <vector>
#include <tbb/concurrent_queue.h>
#include <QThread>
#include <TBBHelpers.h>
#include <NodeList.h>
#include "AvatarMixerSlave.h"

2
libraries/networking/src/LimitedNodeList.cpp
View file

@ -22,8 +22,6 @@
#include <QtCore/QUrl>
#include <QtNetwork/QHostInfo>
#include <tbb/parallel_for.h>
#include <LogHandler.h>
#include <shared/NetworkUtils.h>
#include <NumericalConstants.h>

5
libraries/networking/src/LimitedNodeList.h
View file

@ -31,7 +31,7 @@
#include <QtNetwork/QUdpSocket>
#include <QtNetwork/QHostAddress>
#include <tbb/concurrent_unordered_map.h>
#include <TBBHelpers.h>
#include <DependencyManager.h>
#include <SharedUtil.h>
@ -68,9 +68,8 @@ const QString USERNAME_UUID_REPLACEMENT_STATS_KEY = "$username";
const QString LOCAL_SOCKET_CHANGE_STAT = "LocalSocketChanges";
using namespace tbb;
typedef std::pair<QUuid, SharedNodePointer> UUIDNodePair;
typedef concurrent_unordered_map<QUuid, SharedNodePointer, UUIDHasher> NodeHash;
typedef tbb::concurrent_unordered_map<QUuid, SharedNodePointer, UUIDHasher> NodeHash;
typedef quint8 PingType_t;
namespace PingType {

2
libraries/networking/src/Node.h
View file

@ -24,7 +24,7 @@
#include <QReadLocker>
#include <UUIDHasher.h>
#include <tbb/concurrent_unordered_set.h>
#include <TBBHelpers.h>
#include "HifiSockAddr.h"
#include "NetworkPeer.h"

2
libraries/networking/src/NodeList.h
View file

@ -20,7 +20,7 @@
#include <unistd.h> // not on windows, not needed for mac or windows
#endif
#include <tbb/concurrent_unordered_set.h>
#include <TBBHelpers.h>
#include <QtCore/QElapsedTimer>
#include <QtCore/QMutex>

28
libraries/shared/src/TBBHelpers.h Normal file
View file

@ -0,0 +1,28 @@
//
// Created by Bradley Austin Davis on 2017/06/06
// Copyright 2013-2017 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#pragma once
#ifndef hifi_TBBHelpers_h
#define hifi_TBBHelpers_h
#ifdef _WIN32
#pragma warning( push )
#pragma warning( disable : 4334 )
#endif
#include <tbb/concurrent_queue.h>
#include <tbb/concurrent_unordered_map.h>
#include <tbb/concurrent_unordered_set.h>
#include <tbb/concurrent_vector.h>
#include <tbb/parallel_for.h>
#ifdef _WIN32
#pragma warning( pop )
#endif
#endif // hifi_TBBHelpers_h

2
tools/oven/src/Oven.h
View file

@ -14,7 +14,7 @@
#include <QtWidgets/QApplication>
#include <tbb/concurrent_vector.h>
#include <TBBHelpers.h>
#include <atomic>