Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
ITABase
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Institute of Technical Acoustics (ITA)
ITABase
Commits
3e4b5e97
Commit
3e4b5e97
authored
May 26, 2017
by
Jonas Stienen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing improper merge trial
parent
2ae591d1
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
0 additions
and
22 deletions
+0
-22
include/ITAHPT.h
include/ITAHPT.h
+0
-4
include/ITAMutex.h
include/ITAMutex.h
+0
-3
include/ITATimer.h
include/ITATimer.h
+0
-3
src/ITAAtomicOpsWin32Impl.cpp
src/ITAAtomicOpsWin32Impl.cpp
+0
-3
src/ITACriticalSectionWin32Impl.h
src/ITACriticalSectionWin32Impl.h
+0
-3
src/ITAHPT.cpp
src/ITAHPT.cpp
+0
-3
src/ITAWinPCClock.cpp
src/ITAWinPCClock.cpp
+0
-3
No files found.
include/ITAHPT.h
View file @
3e4b5e97
...
...
@@ -21,10 +21,6 @@
#include <ITABaseDefinitions.h>
<<<<<<<
HEAD
=======
>>>>>>>
e71eb73b43d45b32c4f4050342fe06cf4da2808f
#include <string>
#ifdef WIN32
#ifndef _WIN32_WINNT // @todo: remove
...
...
include/ITAMutex.h
View file @
3e4b5e97
...
...
@@ -21,13 +21,10 @@
#include <ITAUncopyable.h>
<<<<<<<
HEAD
#ifndef _WIN32_WINNT // @todo: remove
#define _WIN32_WINNT 0x0500
#endif
=======
>>>>>>>
e71eb73b43d45b32c4f4050342fe06cf4da2808f
#include <windows.h>
/**
...
...
include/ITATimer.h
View file @
3e4b5e97
...
...
@@ -32,14 +32,11 @@
#include <Windows.h>
#endif
<<<<<<<
HEAD
// Weitere Includes
#ifndef _WIN32_WINNT // @todo: remove
#define _WIN32_WINNT 0x0500
#endif
=======
>>>>>>>
e71eb73b43d45b32c4f4050342fe06cf4da2808f
// Vorwrtsdeklarationen
class
ITATimer
;
...
...
src/ITAAtomicOpsWin32Impl.cpp
View file @
3e4b5e97
#include <ITAAtomicOps.h>
<<<<<<<
HEAD
#ifndef _WIN32_WINNT // @todo: remove
#define _WIN32_WINNT 0x0500
#endif
=======
>>>>>>>
e71eb73b43d45b32c4f4050342fe06cf4da2808f
#include <windows.h>
typedef
union
...
...
src/ITACriticalSectionWin32Impl.h
View file @
3e4b5e97
...
...
@@ -3,12 +3,9 @@
#include "ITACriticalSectionImpl.h"
<<<<<<<
HEAD
#ifndef _WIN32_WINNT // @todo: remove
#define _WIN32_WINNT 0x0500
#endif
=======
>>>>>>>
e71eb73b43d45b32c4f4050342fe06cf4da2808f
#include <windows.h>
class
ITACriticalSectionWin32Impl
:
public
ITACriticalSectionImpl
...
...
src/ITAHPT.cpp
View file @
3e4b5e97
...
...
@@ -12,12 +12,9 @@
#include <cmath>
<<<<<<<
HEAD
#ifndef _WIN32_WINNT // @todo: remove
#define _WIN32_WINNT 0x0500
#endif
=======
>>>>>>>
e71eb73b43d45b32c4f4050342fe06cf4da2808f
#include <windows.h>
#include "ITAException.h"
...
...
src/ITAWinPCClock.cpp
View file @
3e4b5e97
...
...
@@ -4,12 +4,9 @@
#include <ITAException.h>
<<<<<<<
HEAD
#ifndef _WIN32_WINNT // @todo: remove
#define _WIN32_WINNT 0x0500
#endif
=======
>>>>>>>
e71eb73b43d45b32c4f4050342fe06cf4da2808f
#include <windows.h>
ITAWinPCClock
*
ITAWinPCClock
::
m_pInstance
=
NULL
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment