Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
David Youssefi
otb
Commits
2dba85eb
Commit
2dba85eb
authored
14 years ago
by
Tishampati Dhar
Browse files
Options
Downloads
Patches
Plain Diff
BUG: Added MSVC 2010 specific code switches. MSVC 2010 does not compile with these lines included
parent
2a3afb51
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Utilities/ITK/Code/Common/itk_hash_map.h
+4
-0
4 additions, 0 deletions
Utilities/ITK/Code/Common/itk_hash_map.h
Utilities/ITK/Code/Common/itk_hashtable.h
+5
-0
5 additions, 0 deletions
Utilities/ITK/Code/Common/itk_hashtable.h
with
9 additions
and
0 deletions
Utilities/ITK/Code/Common/itk_hash_map.h
+
4
−
0
View file @
2dba85eb
...
@@ -185,7 +185,9 @@ public:
...
@@ -185,7 +185,9 @@ public:
bool
empty
()
const
{
return
rep
.
empty
();
}
bool
empty
()
const
{
return
rep
.
empty
();
}
void
swap
(
self
&
hs
)
{
rep
.
swap
(
hs
.
rep
);
}
void
swap
(
self
&
hs
)
{
rep
.
swap
(
hs
.
rep
);
}
#if _MSC_VER != 1600
friend
bool
operator
==
ITK_FRIEND_TEMPLATE_FUNCTION_ARGUMENT
(
self
)(
const
self
&
,
const
self
&
);
friend
bool
operator
==
ITK_FRIEND_TEMPLATE_FUNCTION_ARGUMENT
(
self
)(
const
self
&
,
const
self
&
);
#endif
iterator
begin
()
{
return
rep
.
begin
();
}
iterator
begin
()
{
return
rep
.
begin
();
}
iterator
end
()
{
return
rep
.
end
();
}
iterator
end
()
{
return
rep
.
end
();
}
...
@@ -289,7 +291,9 @@ public:
...
@@ -289,7 +291,9 @@ public:
bool
empty
()
const
{
return
rep
.
empty
();
}
bool
empty
()
const
{
return
rep
.
empty
();
}
void
swap
(
self
&
hs
)
{
rep
.
swap
(
hs
.
rep
);
}
void
swap
(
self
&
hs
)
{
rep
.
swap
(
hs
.
rep
);
}
#if _MSC_VER != 1600
friend
bool
operator
==
ITK_FRIEND_TEMPLATE_FUNCTION_ARGUMENT
(
self
)(
const
self
&
,
const
self
&
);
friend
bool
operator
==
ITK_FRIEND_TEMPLATE_FUNCTION_ARGUMENT
(
self
)(
const
self
&
,
const
self
&
);
#endif
iterator
begin
()
{
return
rep
.
begin
();
}
iterator
begin
()
{
return
rep
.
begin
();
}
iterator
end
()
{
return
rep
.
end
();
}
iterator
end
()
{
return
rep
.
end
();
}
...
...
This diff is collapsed.
Click to expand it.
Utilities/ITK/Code/Common/itk_hashtable.h
+
5
−
0
View file @
2dba85eb
...
@@ -471,7 +471,9 @@ public:
...
@@ -471,7 +471,9 @@ public:
const_iterator
end
()
const
{
return
const_iterator
((
node
*
)
0
,
this
);
}
const_iterator
end
()
const
{
return
const_iterator
((
node
*
)
0
,
this
);
}
#if _MSC_VER != 1600
friend
bool
operator
==
ITK_FRIEND_TEMPLATE_FUNCTION_ARGUMENT
(
self
)(
const
self
&
,
const
self
&
);
friend
bool
operator
==
ITK_FRIEND_TEMPLATE_FUNCTION_ARGUMENT
(
self
)(
const
self
&
,
const
self
&
);
#endif
public
:
public
:
...
@@ -1144,14 +1146,17 @@ void hashtable_base<Value, Alloc>::copy_from(const hashtable_base<Value, Alloc>&
...
@@ -1144,14 +1146,17 @@ void hashtable_base<Value, Alloc>::copy_from(const hashtable_base<Value, Alloc>&
// A few compatability fixes. Placed here for automatic include in
// A few compatability fixes. Placed here for automatic include in
// both the hash_set and the hash_map sources.
// both the hash_set and the hash_map sources.
# if defined (_MSC_VER) || defined(__BORLANDC__) || ((defined(__ICC)||defined(__ECC)) && defined(linux))
# if defined (_MSC_VER) || defined(__BORLANDC__) || ((defined(__ICC)||defined(__ECC)) && defined(linux))
namespace
std
namespace
std
{
{
#if _MSC_VER != 1600
template
<
class
T
>
template
<
class
T
>
struct
identity
:
public
std
::
unary_function
<
T
,
T
>
{
struct
identity
:
public
std
::
unary_function
<
T
,
T
>
{
public:
public:
const
T
&
operator
()(
const
T
&
x
)
const
{
return
x
;
}
const
T
&
operator
()(
const
T
&
x
)
const
{
return
x
;
}
};
};
#endif
}
}
template
<
class
_Pair
>
template
<
class
_Pair
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment