Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
D
dlib
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
钟尚武
dlib
Commits
dd054907
Commit
dd054907
authored
Oct 13, 2012
by
Davis King
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor changes to avoid compiler errors in visual studio 2012
parent
fc3ce10a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
std_allocator.h
dlib/std_allocator.h
+3
-1
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