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
cfb86ab1
Commit
cfb86ab1
authored
Nov 17, 2012
by
Davis King
Browse files
Changed name of private logger to avoid name conflicts in derived classes.
parent
93a232d3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
dlib/server/server_iostream.cpp
dlib/server/server_iostream.cpp
+1
-1
dlib/server/server_iostream.h
dlib/server/server_iostream.h
+2
-2
No files found.
dlib/server/server_iostream.cpp
View file @
cfb86ab1
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
namespace
dlib
namespace
dlib
{
{
const
logger
server_iostream
::
dl
og
(
"dlib.server_iostream"
);
const
logger
server_iostream
::
_dL
og
(
"dlib.server_iostream"
);
}
}
#endif // DLIB_SERVER_IOSTREAM_CPp_
#endif // DLIB_SERVER_IOSTREAM_CPp_
...
...
dlib/server/server_iostream.h
View file @
cfb86ab1
...
@@ -126,7 +126,7 @@ namespace dlib
...
@@ -126,7 +126,7 @@ namespace dlib
}
}
}
}
dl
og
<<
LERROR
<<
"We ran out of memory in server_iostream::on_connect()"
;
_dL
og
<<
LERROR
<<
"We ran out of memory in server_iostream::on_connect()"
;
// if this is an escaped exception from on_connect then let it fly!
// if this is an escaped exception from on_connect then let it fly!
// Seriously though, this way it is obvious to the user that something bad happened
// Seriously though, this way it is obvious to the user that something bad happened
// since they probably won't have the dlib logger enabled.
// since they probably won't have the dlib logger enabled.
...
@@ -137,7 +137,7 @@ namespace dlib
...
@@ -137,7 +137,7 @@ namespace dlib
uint64
next_id
;
uint64
next_id
;
id_map
con_map
;
id_map
con_map
;
const
static
logger
dl
og
;
const
static
logger
_dL
og
;
mutex
m
;
mutex
m
;
...
...
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