Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CoMISo
Base
Commits
3623fbdf
Commit
3623fbdf
authored
Aug 14, 2019
by
David Bommes
Browse files
Merge branch 'no-boost' into 'master'
fix build without boost See merge request
!9
parents
f31f6e3a
5c54ef00
Changes
2
Hide whitespace changes
Inline
Side-by-side
Utils/IOutputStream.cc
View file @
3623fbdf
...
...
@@ -5,7 +5,12 @@
#include
"Base/Code/CodeLink.hh"
#include
"Base/Utils/ThrowError.hh"
#include
<boost/filesystem.hpp>
#include
<cstring>
#if COMISO_BOOST_AVAILABLE
# include <boost/filesystem.hpp>
#endif
#include
<string>
namespace
Base
{
...
...
@@ -63,10 +68,12 @@ IOutputStream& operator<<(IOutputStream& _os, const Command::Type _cmd_type)
}
#if COMISO_BOOST_AVAILABLE
IOutputStream
&
operator
<<
(
IOutputStream
&
_os
,
const
boost
::
filesystem
::
path
&
_path
)
{
return
_os
<<
'\"'
<<
_path
.
string
().
c_str
()
<<
'\"'
;
}
#endif // COMISO_BOOST_AVAILABLE
// Represent this as an object in the stream, to preserve the streaming order
struct
FunctionNameFilter
...
...
Utils/IOutputStream.hh
View file @
3623fbdf
...
...
@@ -15,6 +15,8 @@
#include
<Base/Config/BaseDefines.hh>
#include
<CoMISo/Config/config.hh>
#ifdef STD_ARRAY_AVAILABLE
#include
<array>
#endif//STD_ARRAY_AVAILABLE
...
...
@@ -95,8 +97,10 @@ BASEDLLEXPORT IOutputStream& operator<<(IOutputStream& _os, const Command& _co);
BASEDLLEXPORT
IOutputStream
&
operator
<<
(
IOutputStream
&
_os
,
const
Command
::
Type
_cmd_type
);
#if COMISO_BOOST_AVAILABLE
BASEDLLEXPORT
IOutputStream
&
operator
<<
(
IOutputStream
&
_os
,
const
boost
::
filesystem
::
path
&
_path
);
#endif // COMISO_BOOST_AVAILABLE
//! IStream operator for std::vector<>
template
<
typename
ElementT
>
...
...
@@ -268,4 +272,6 @@ inline FormatT<> format_hex(const uint64_t _vrbl)
}
//namespace Base
#endif//BASE_IOUTPUTSTREAM_HH_INCLUDE
Write
Preview
Supports
Markdown
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