Skip to content

Commit 5083639

Browse files
author
Robert Hartmann
committed
Temporarily remove puppy debug tools due to missing reentrancy
1 parent 4acfa93 commit 5083639

8 files changed

+34
-4
lines changed

IndradriveAPI.vcxproj

+1
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@ python $(ProjectDir)tools\get-git-rev-HEAD.py $(MSBuildProjectDirectory) $(Proje
288288
</Link>
289289
</ItemDefinitionGroup>
290290
<ItemGroup>
291+
<ClInclude Include="debug.h" />
291292
<ClInclude Include="errors.h" />
292293
<ClInclude Include="helpers.h" />
293294
<ClInclude Include="resource.h" />

IndradriveAPI.vcxproj.filters

+3
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@
5353
<ClInclude Include="Wrapper.h">
5454
<Filter>Header Files</Filter>
5555
</ClInclude>
56+
<ClInclude Include="debug.h">
57+
<Filter>Header Files</Filter>
58+
</ClInclude>
5659
</ItemGroup>
5760
<ItemGroup>
5861
<ResourceCompile Include="IndradriveAPI.rc">

Wrapper.h

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "SISProtocol.h"
77
#include "RS232.h"
88
#include "errors.h"
9+
#include "debug.h"
910

1011

1112
/* building a DLL */

debug.h

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#ifndef _DEBUG_H_
2+
#define _DEBUG_H_
3+
4+
//#include "poppydebugtools.h"
5+
#include <string>
6+
7+
8+
#define STACK
9+
#define STACK_SECTION(x)
10+
11+
12+
class Stack
13+
{
14+
private:
15+
Stack() {}
16+
public:
17+
static std::string GetTraceString()
18+
{
19+
return std::string();
20+
}
21+
};
22+
23+
#endif // !_DEBUG_H_
24+

serial/RS232.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
#include "ftd2xx.h"
3232
#include "helpers.h"
33-
#include "PoppyDebugTools.h"
33+
#include "debug.h"
3434

3535

3636

sis/SISProtocol.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <string>
66
#include <mutex>
77

8-
#include "poppydebugtools.h"
8+
#include "debug.h"
99
#include "helpers.h"
1010
#include "RS232.h"
1111
#include "Telegrams.h"

sis/Telegrams.h

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include <Windows.h>
55
#include <vector>
6+
#include <algorithm>
67
#include <numeric>
78
#include <type_traits>
89

version.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
// Will be automatically increased by AutoIncreaseBuildNrs.exe
77
// cmd: AutoIncreaseBuildNrs.exe version.h
8-
#define VER_BUILDNR 35
8+
#define VER_BUILDNR 60
99
// Will be automatically increased by get-git-rev-HEAD.py
1010
// cmd: python get-git-rev-HEAD.py $(MSBuildProjectDir) version.h
11-
#define VER_BUILD bb976fa
11+
#define VER_BUILD 4acfa93
1212

1313

1414
#define VERSION_MAJOR 0

0 commit comments

Comments
 (0)