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
24efbdbc
Commit
24efbdbc
authored
Jun 07, 2016
by
Davis King
Browse files
fixed warning and typo in comment
parent
ffb44342
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
dlib/error.h
dlib/error.h
+2
-3
dlib/matlab/subprocess_stream.h
dlib/matlab/subprocess_stream.h
+1
-1
No files found.
dlib/error.h
View file @
24efbdbc
...
@@ -260,9 +260,7 @@ namespace dlib
...
@@ -260,9 +260,7 @@ namespace dlib
// them.
// them.
#if defined(MATLAB_MEX_FILE)
#if defined(MATLAB_MEX_FILE)
return
;
return
;
#endif
#else
static
bool
is_first_fatal_error
=
true
;
static
bool
is_first_fatal_error
=
true
;
if
(
is_first_fatal_error
==
false
)
if
(
is_first_fatal_error
==
false
)
{
{
...
@@ -292,6 +290,7 @@ namespace dlib
...
@@ -292,6 +290,7 @@ namespace dlib
std
::
set_terminate
(
&
dlib_fatal_error_terminate
);
std
::
set_terminate
(
&
dlib_fatal_error_terminate
);
}
}
is_first_fatal_error
=
false
;
is_first_fatal_error
=
false
;
#endif
}
}
};
};
...
...
dlib/matlab/subprocess_stream.h
View file @
24efbdbc
...
@@ -93,7 +93,7 @@ namespace dlib
...
@@ -93,7 +93,7 @@ namespace dlib
This is a tool for spawning a subprocess and communicating with it through
This is a tool for spawning a subprocess and communicating with it through
that processes standard input, output, and error. Here is an example:
that processes standard input, output, and error. Here is an example:
subprocess_stream s("/usr/bin/echo")
subprocess_stream s("/usr/bin/echo")
;
s << "echo me this!";
s << "echo me this!";
string line;
string line;
getline(s, line);
getline(s, line);
...
...
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