1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
--- tripwire-2.3.1-2/src/core/resources.h.jbj 2002-11-16 13:08:59.000000000 -0500
+++ tripwire-2.3.1-2/src/core/resources.h 2002-11-16 14:07:42.000000000 -0500
@@ -98,7 +98,7 @@
typedef Value& ValueRef;
typedef const Value& ConstValueRef;
- typedef Table::value_type Pair;
+ typedef typename Table::value_type Pair;
--- tripwire-2.3.1-2/src/core/archive.cpp.jbj 2002-11-16 13:42:37.000000000 -0500
+++ tripwire-2.3.1-2/src/core/archive.cpp 2002-11-16 13:42:51.000000000 -0500
@@ -45,7 +45,7 @@
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <iostream.h>
+#include <iostream>
#include "file.h"
#include "stringutil.h"
--- tripwire-2.3.1-2/src/core/stringutil.h.jbj 2002-11-16 13:44:39.000000000 -0500
+++ tripwire-2.3.1-2/src/core/stringutil.h 2002-11-16 13:49:08.000000000 -0500
@@ -169,7 +169,7 @@
//- - - - - - - - - - - - - - - - - - - - - - - - - -
// required typedef ( to be a container it must have this... )
//- - - - - - - - - - - - - - - - - - - - - - - - - -
- typedef _ParentT::value_type value_type;
+ typedef typename _ParentT::value_type value_type;
//- - - - - - - - - - - - - - - - - - - - - - - - - -
// required constructors and assignment operators...
--- tripwire-2.3.1-2/src/tw/twutil.cpp.jbj 2002-11-16 14:34:10.000000000 -0500
+++ tripwire-2.3.1-2/src/tw/twutil.cpp 2002-11-16 14:37:07.000000000 -0500
@@ -672,7 +672,7 @@
throw eSerializerInputStreamFmt(_T(""), filename, eSerializer::TY_FILE);
}
- d.TraceDebug("Found a file header of type %d.\n", fileHeader.GetID());
+ // d.TraceDebug("Found a file header of type %d.\n", fileHeader.GetID());
// check for a mismatched header
if (fileHeader.GetID() != cConfigFile::GetFileHeaderID())
@@ -775,7 +775,7 @@
throw eSerializerInputStreamFmt(_T(""), filename.c_str(), eSerializer::TY_FILE);
}
- d.TraceDebug("Found a file header of type %d.\n", fileHeader.GetID());
+ // d.TraceDebug("Found a file header of type %d.\n", fileHeader.GetID());
// check for a mismatched header
if (fileHeader.GetID() != cConfigFile::GetFileHeaderID())
|
GitWeb
