Skip to content
GitLab
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
0e0be2e4
Commit
0e0be2e4
authored
Feb 11, 2020
by
Martin Marinov
Committed by
GitHub Enterprise
Feb 11, 2020
Browse files
Fix Linux build errors (#7)
parent
f90c9415
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
0e0be2e4
...
...
@@ -44,7 +44,7 @@ target_include_directories(${output_lib} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/.."
set_target_properties
(
${
output_lib
}
PROPERTIES CXX_VISIBILITY_PRESET hidden
)
set_target_properties
(
${
output_lib
}
PROPERTIES C_VISIBILITY_PRESET hidden
)
set_target_properties
(
${
output_lib
}
PROPERTIES C_STANDARD 99
)
set_target_properties
(
${
output_lib
}
PROPERTIES CXX_STANDARD 1
1
)
set_target_properties
(
${
output_lib
}
PROPERTIES CXX_STANDARD 1
4
)
set_target_properties
(
${
output_lib
}
PROPERTIES POSITION_INDEPENDENT_CODE ON
)
if
(
MSVC
)
...
...
Journal/JournalStream.hh
View file @
0e0be2e4
...
...
@@ -362,7 +362,7 @@ template <typename T, ArgQ Q> struct ArgT
{
using
Type
=
T
;
constexpr
ArgQ
quality
()
{
return
Q
;
}
constexpr
static
ArgQ
quality
()
{
return
Q
;
}
typedef
ArgT
<
T
,
Q
>
Self
;
T
&
vrbl
;
...
...
@@ -374,9 +374,9 @@ template <typename T, ArgQ Q> struct ArgT
template
<
typename
T
>
auto
argument
(
T
&
_vrbl
,
const
char
*
const
_name
)
{
using
Arg
=
using
Arg
=
typename
std
::
conditional
<
std
::
is_pointer
<
T
>::
value
,
ArgT
<
T
,
ArgQ
::
POINTER
>
,
std
::
conditional
<
std
::
is_reference
<
T
>::
value
,
typename
std
::
conditional
<
std
::
is_reference
<
T
>::
value
,
ArgT
<
T
,
ArgQ
::
REFERENCE
>
,
ArgT
<
T
,
ArgQ
::
VALUE
>>::
type
>::
type
;
return
Arg
(
_vrbl
,
_name
);
}
...
...
@@ -397,7 +397,7 @@ protected:
ArgSetT
(
const
Arg
&
_arg
)
:
Arg
(
_arg
)
{}
template
<
typename
ValueT
>
void
assign
(
ValueT
_val
)
{
vrbl
=
_val
;
}
template
<
typename
ValueT
>
void
assign
(
ValueT
_val
)
{
Arg
::
vrbl
=
_val
;
}
void
init
()
{
assign
(
nullptr
);
}
...
...
@@ -473,7 +473,7 @@ template <typename T, ArgQ Q> struct ArgLinkT : public ArgSetT<T, Q>
~
ArgLinkT
()
{
if
(
mode
==
LinkMode
::
AUTO
)
make_link
(
link
.
name
);
ArgSet
::
make_link
(
link
.
name
);
}
};
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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