Starting from 2021-07-01, all LRZ GitLab users will be required to explicitly accept the GitLab Terms of Service. Please see the detailed information at https://doku.lrz.de/display/PUBLIC/GitLab and make sure that your projects conform to the requirements.

Commit cfff4e09 authored by schultezub's avatar schultezub
Browse files

fixed TBB includes

git-svn-id: https://camplinux.in.tum.de/svn/campvis/trunk@449 bb408c1c-ae56-11e1-83d9-df6b3e0c105e
parent ad3e8de6
......@@ -37,7 +37,7 @@
#include "tgt/qt/qtapplication.h"
#include "tgt/qt/qtthreadedcanvas.h"
#include "tgt/qt/qtcontextmanager.h"
#include "tbb/include/tbb/compat/thread"
#include "tbb/compat/thread"
#ifdef HAS_KISSCL
#include "kisscl/clruntime.h"
......
......@@ -31,8 +31,8 @@
#define CAMPVISPAINTER_H__
#include "sigslot/sigslot.h"
#include "tbb/include/tbb/atomic.h"
#include "tbb/include/tbb/compat/condition_variable"
#include "tbb/atomic.h"
#include "tbb/compat/condition_variable"
#include "tgt/logmanager.h"
#include "tgt/painter.h"
......
......@@ -36,7 +36,7 @@
#include "tgt/event/mouseevent.h"
#include "tgt/qt/qtcontextmanager.h"
#include "tgt/qt/qtthreadedcanvas.h"
#include "tbb/include/tbb/mutex.h"
#include "tbb/mutex.h"
#include "application/gui/qtdatahandle.h"
......
......@@ -34,7 +34,7 @@
#include "tgt/painter.h"
#include "tgt/qt/qtcontextmanager.h"
#include "tgt/qt/qtthreadedcanvas.h"
#include "tbb/include/tbb/mutex.h"
#include "tbb/mutex.h"
#include "application/gui/qtdatahandle.h"
#include "application/gui/datacontainerinspectorcanvas.h"
......
......@@ -31,7 +31,7 @@
#define ABSTRACTPROPERTYWIDGET_H__
#include "sigslot/sigslot.h"
#include "tbb/include/tbb/atomic.h"
#include "tbb/atomic.h"
#include <QBoxLayout>
#include <QLabel>
#include <QWidget>
......
......@@ -30,7 +30,7 @@
#ifndef GEOMETRY1DTRANSFERFUNCTIONEDITOR_H__
#define GEOMETRY1DTRANSFERFUNCTIONEDITOR_H__
#include "tbb/include/tbb/mutex.h"
#include "tbb/mutex.h"
#include "tgt/painter.h"
#include "tgt/event/eventlistener.h"
#include "core/classification/tfgeometry1d.h"
......
......@@ -30,7 +30,7 @@
#ifndef GEOMETRY2DTRANSFERFUNCTIONEDITOR_H__
#define GEOMETRY2DTRANSFERFUNCTIONEDITOR_H__
#include "tbb/include/tbb/mutex.h"
#include "tbb/mutex.h"
#include "tgt/painter.h"
#include "tgt/event/eventlistener.h"
#include "core/classification/tfgeometry2d.h"
......
......@@ -29,7 +29,7 @@
#include "abstracttransferfunction.h"
#include "tbb/include/tbb/tbb.h"
#include "tbb/tbb.h"
#include "tgt/assert.h"
#include "tgt/logmanager.h"
#include "tgt/shadermanager.h"
......
......@@ -32,8 +32,8 @@
#include "sigslot/sigslot.h"
#include "tgt/vector.h"
#include "tbb/include/tbb/atomic.h"
#include "tbb/include/tbb/mutex.h"
#include "tbb/atomic.h"
#include "tbb/mutex.h"
#include "core/datastructures/datahandle.h"
#include "core/tools/concurrenthistogram.h"
......
......@@ -31,7 +31,7 @@
#define DATACONTAINER_H__
#include "sigslot/sigslot.h"
#include "tbb/include/tbb/spin_mutex.h"
#include "tbb/spin_mutex.h"
#include "core/datastructures/datahandle.h"
#include <string>
......
......@@ -29,8 +29,8 @@
#include "imagerepresentationlocal.h"
#include "tbb/include/tbb/tbb.h"
#include "tbb/include/tbb/spin_mutex.h"
#include "tbb/tbb.h"
#include "tbb/spin_mutex.h"
#include "core/datastructures/imagerepresentationdisk.h"
#include "core/datastructures/genericimagerepresentationlocal.h"
......
......@@ -32,8 +32,8 @@
#include "sigslot/sigslot.h"
#include "tgt/logmanager.h"
#include "tbb/include/tbb/spin_mutex.h"
#include "tbb/include/tbb/mutex.h"
#include "tbb/spin_mutex.h"
#include "tbb/mutex.h"
#include "core/tools/invalidationlevel.h"
#include "core/datastructures/datacontainer.h"
#include "core/properties/propertycollection.h"
......
......@@ -31,7 +31,7 @@
#define PROCESSOR_H__
#include "sigslot/sigslot.h"
#include "tbb/include/tbb/atomic.h"
#include "tbb/atomic.h"
#include "tgt/logmanager.h"
#include "core/datastructures/datacontainer.h"
#include "core/tools/invalidationlevel.h"
......
......@@ -32,7 +32,7 @@
#include "sigslot/sigslot.h"
#include "core/tools/runnable.h"
#include "tbb/include/tbb/compat/condition_variable"
#include "tbb/compat/condition_variable"
namespace campvis {
class AbstractPipeline;
......
......@@ -31,8 +31,8 @@
#define ABSTRACTPROPERTY_H__
#include "sigslot/sigslot.h"
#include "tbb/include/tbb/atomic.h"
#include "tbb/include/tbb/spin_mutex.h"
#include "tbb/atomic.h"
#include "tbb/spin_mutex.h"
#include "tgt/logmanager.h"
#include "core/tools/invalidationlevel.h"
......
......@@ -30,7 +30,7 @@
#ifndef GENERICPROPERTY_H__
#define GENERICPROPERTY_H__
#include "tbb/include/tbb/spin_mutex.h"
#include "tbb/spin_mutex.h"
#include "tgt/logmanager.h"
#include "core/properties/abstractproperty.h"
......
......@@ -34,7 +34,7 @@
#include "tgt/assert.h"
#include "tgt/logmanager.h"
#include "tgt/tgt_math.h"
#include "tbb/include/tbb/atomic.h"
#include "tbb/atomic.h"
namespace campvis {
......
......@@ -30,7 +30,7 @@
#ifndef OBSERVER_H__
#define OBSERVER_H__
#include "tbb/include/tbb/spin_mutex.h"
#include "tbb/spin_mutex.h"
#include <set>
namespace campvis {
......
......@@ -32,11 +32,11 @@
#include "sigslot/sigslot.h"
#include "tgt/singleton.h"
#include "tbb/include/tbb/atomic.h"
#include "tbb/include/tbb/concurrent_queue.h"
#include "tbb/include/tbb/concurrent_hash_map.h"
#include "tbb/include/tbb/concurrent_vector.h"
#include "tbb/include/tbb/compat/condition_variable"
#include "tbb/atomic.h"
#include "tbb/concurrent_queue.h"
#include "tbb/concurrent_hash_map.h"
#include "tbb/concurrent_vector.h"
#include "tbb/compat/condition_variable"
#include "core/tools/job.h"
#include "core/tools/runnable.h"
......
......@@ -30,7 +30,7 @@
#ifndef REFERENCECOUNTED_H__
#define REFERENCECOUNTED_H__
#include "tbb/include/tbb/atomic.h"
#include "tbb/atomic.h"
namespace campvis {
/**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment