Commit 2ae591d1 authored by Jonas Stienen's avatar Jonas Stienen

Merging WINNT def stuff

parents 7567ceb1 e71eb73b
## ITABase
ITABase is a C++ programming library with basic tools for digital audio processing.
ITABase is the fundamental component from [ITACoreLibs](https://git.rwth-aachen.de/ita/ITACoreLibs), a collection of C++ libraries for virtual acoustics.
ITABase is a C++ programming library with basic classes and tools for digital audio processing.
ITABase is the fundamental component of [ITACoreLibs](https://git.rwth-aachen.de/ita/ITACoreLibs), a collection of C++ libraries for virtual acoustics.
### License
See [LICENSE](LICENSE.md) file.
Copyright 2015-2017 Institute of Technical Acoustics, RWTH Aachen University
Licensed under the Apache License, Version 2.0 (the "License");
you may not use files of this project except in compliance with the License.
You may obtain a copy of the License at
<http://www.apache.org/licenses/LICENSE-2.0>
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
### Quick build guide
Follow instructions from Wiki pages of [ITABase](https://git.rwth-aachen.de/ita/ITABase/wikis/home) project.
It is recommended to clone and follow the build guide of the parent project [ITACoreLibs](https://git.rwth-aachen.de/ita/ITACoreLibs/wikis/home), which includes this project as a submodule.
......@@ -21,7 +21,10 @@
#include <ITABaseDefinitions.h>
<<<<<<< HEAD
=======
>>>>>>> e71eb73b43d45b32c4f4050342fe06cf4da2808f
#include <string>
#ifdef WIN32
#ifndef _WIN32_WINNT // @todo: remove
......
......@@ -21,10 +21,13 @@
#include <ITAUncopyable.h>
<<<<<<< HEAD
#ifndef _WIN32_WINNT // @todo: remove
#define _WIN32_WINNT 0x0500
#endif
=======
>>>>>>> e71eb73b43d45b32c4f4050342fe06cf4da2808f
#include <windows.h>
/**
......
This diff is collapsed.
......@@ -32,11 +32,14 @@
#include <Windows.h>
#endif
<<<<<<< HEAD
// Weitere Includes
#ifndef _WIN32_WINNT // @todo: remove
#define _WIN32_WINNT 0x0500
#endif
=======
>>>>>>> e71eb73b43d45b32c4f4050342fe06cf4da2808f
// Vorwrtsdeklarationen
class ITATimer;
......
......@@ -27,17 +27,17 @@ class ITA_BASE_API ITAUncopyable
{
protected:
// Erlaubt fr Unterklassen: Standardkonstruktor
ITAUncopyable() {};
inline ITAUncopyable() {};
// Erlaubt fr Unterklassen: Destruktor
virtual ~ITAUncopyable() {}
virtual inline ~ITAUncopyable() {};
private:
// Verboten fr alle: Kopierkonstruktor
ITAUncopyable(const ITAUncopyable&) {}
inline ITAUncopyable( const ITAUncopyable& ) {};
// Verboten fr alle: Zuweisungsoperator
ITAUncopyable& operator=(const ITAUncopyable&);
ITAUncopyable& operator=( const ITAUncopyable& );
};
#endif // INCLUDE_WATCHER_ITA_UNCOPYABLE
#include <ITAAtomicOps.h>
<<<<<<< HEAD
#ifndef _WIN32_WINNT // @todo: remove
#define _WIN32_WINNT 0x0500
#endif
=======
>>>>>>> e71eb73b43d45b32c4f4050342fe06cf4da2808f
#include <windows.h>
typedef union
......
......@@ -3,9 +3,12 @@
#include "ITACriticalSectionImpl.h"
<<<<<<< HEAD
#ifndef _WIN32_WINNT // @todo: remove
#define _WIN32_WINNT 0x0500
#endif
=======
>>>>>>> e71eb73b43d45b32c4f4050342fe06cf4da2808f
#include <windows.h>
class ITACriticalSectionWin32Impl : public ITACriticalSectionImpl
......
......@@ -12,9 +12,12 @@
#include <cmath>
<<<<<<< HEAD
#ifndef _WIN32_WINNT // @todo: remove
#define _WIN32_WINNT 0x0500
#endif
=======
>>>>>>> e71eb73b43d45b32c4f4050342fe06cf4da2808f
#include <windows.h>
#include "ITAException.h"
......
......@@ -4,9 +4,12 @@
#include <ITAException.h>
<<<<<<< HEAD
#ifndef _WIN32_WINNT // @todo: remove
#define _WIN32_WINNT 0x0500
#endif
=======
>>>>>>> e71eb73b43d45b32c4f4050342fe06cf4da2808f
#include <windows.h>
ITAWinPCClock* ITAWinPCClock::m_pInstance = NULL;
......
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