Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
dd054907
Commit
dd054907
authored
Oct 13, 2012
by
Davis King
Browse files
Minor changes to avoid compiler errors in visual studio 2012
parent
fc3ce10a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
dlib/std_allocator.h
dlib/std_allocator.h
+3
-1
dlib/test/tuple.cpp
dlib/test/tuple.cpp
+2
-0
No files found.
dlib/std_allocator.h
View file @
dd054907
...
@@ -33,7 +33,7 @@ namespace dlib
...
@@ -33,7 +33,7 @@ namespace dlib
using whatever dlib memory manager you supply.
using whatever dlib memory manager you supply.
Thus, using this allocator object you can use any of the dlib memory manager objects with
Thus, using this allocator object you can use any of the dlib memory manager objects with
the contains in the STL or with any other object that requires a C++ allocator object.
the contain
er
s in the STL or with any other object that requires a C++ allocator object.
It is important to note that many STL implementations make the assumption that the memory
It is important to note that many STL implementations make the assumption that the memory
allocated by one allocator can be freed by another. This effectively means that you should
allocated by one allocator can be freed by another. This effectively means that you should
...
@@ -119,6 +119,8 @@ namespace dlib
...
@@ -119,6 +119,8 @@ namespace dlib
pool
.
swap
(
item
.
pool
);
pool
.
swap
(
item
.
pool
);
}
}
std_allocator
&
operator
=
(
const
std_allocator
&
)
{
return
*
this
;}
private:
private:
typename
M
::
template
rebind
<
char
>
::
other
pool
;
typename
M
::
template
rebind
<
char
>
::
other
pool
;
};
};
...
...
dlib/test/tuple.cpp
View file @
dd054907
...
@@ -75,6 +75,8 @@ namespace
...
@@ -75,6 +75,8 @@ namespace
print_spinner
();
print_spinner
();
using
dlib
::
tuple
;
tuple
<>
a
;
tuple
<>
a
;
tuple
<
int
>
b
;
tuple
<
int
>
b
;
tuple
<
int
,
float
>
c
;
tuple
<
int
,
float
>
c
;
...
...
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