Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
wolf
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mobile_robotics
wolf_projects
wolf_lib
wolf
Commits
7b97ac52
Commit
7b97ac52
authored
8 years ago
by
Jeremie Deray
Browse files
Options
Downloads
Patches
Plain Diff
fix error type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
parent
3065d2ac
No related branches found
No related tags found
1 merge request
!91
catkin build
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/landmark_base.h
+2
-2
2 additions, 2 deletions
src/landmark_base.h
src/processor_motion.h
+4
-4
4 additions, 4 deletions
src/processor_motion.h
src/processor_tracker.h
+2
-2
2 additions, 2 deletions
src/processor_tracker.h
with
8 additions
and
8 deletions
src/landmark_base.h
+
2
−
2
View file @
7b97ac52
...
@@ -61,7 +61,7 @@ class LandmarkBase : public NodeBase, public std::enable_shared_from_this<Landma
...
@@ -61,7 +61,7 @@ class LandmarkBase : public NodeBase, public std::enable_shared_from_this<Landma
// Properties
// Properties
unsigned
int
id
();
unsigned
int
id
();
void
setId
(
unsigned
int
_id
);
void
setId
(
unsigned
int
_id
);
const
LandmarkType
getTypeId
()
const
;
LandmarkType
getTypeId
()
const
;
// Fix / unfix
// Fix / unfix
void
setStatus
(
LandmarkStatus
_st
);
void
setStatus
(
LandmarkStatus
_st
);
...
@@ -240,7 +240,7 @@ inline const Eigen::VectorXs& LandmarkBase::getDescriptor() const
...
@@ -240,7 +240,7 @@ inline const Eigen::VectorXs& LandmarkBase::getDescriptor() const
return
descriptor_
;
return
descriptor_
;
}
}
inline
const
LandmarkType
LandmarkBase
::
getTypeId
()
const
inline
LandmarkType
LandmarkBase
::
getTypeId
()
const
{
{
return
type_id_
;
return
type_id_
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/processor_motion.h
+
4
−
4
View file @
7b97ac52
...
@@ -100,13 +100,13 @@ class ProcessorMotion : public ProcessorBase
...
@@ -100,13 +100,13 @@ class ProcessorMotion : public ProcessorBase
/** \brief Fills a reference to the state integrated so far
/** \brief Fills a reference to the state integrated so far
* \param _x the returned state vector
* \param _x the returned state vector
*/
*/
const
void
getCurrentState
(
Eigen
::
VectorXs
&
_x
);
void
getCurrentState
(
Eigen
::
VectorXs
&
_x
);
/** \brief Fills a reference to the state integrated so far and its stamp
/** \brief Fills a reference to the state integrated so far and its stamp
* \param _x the returned state vector
* \param _x the returned state vector
* \param _ts the returned stamp
* \param _ts the returned stamp
*/
*/
const
void
getCurrentState
(
Eigen
::
VectorXs
&
_x
,
TimeStamp
&
_ts
);
void
getCurrentState
(
Eigen
::
VectorXs
&
_x
,
TimeStamp
&
_ts
);
/** \brief Gets a constant reference to the state integrated so far
/** \brief Gets a constant reference to the state integrated so far
* \return the state vector
* \return the state vector
...
@@ -700,13 +700,13 @@ inline const Eigen::VectorXs& ProcessorMotion::getCurrentState(TimeStamp& _ts)
...
@@ -700,13 +700,13 @@ inline const Eigen::VectorXs& ProcessorMotion::getCurrentState(TimeStamp& _ts)
return
x_
;
return
x_
;
}
}
inline
const
void
ProcessorMotion
::
getCurrentState
(
Eigen
::
VectorXs
&
_x
)
inline
void
ProcessorMotion
::
getCurrentState
(
Eigen
::
VectorXs
&
_x
)
{
{
Scalar
Dt
=
getBuffer
().
get
().
back
().
ts_
-
origin_ptr_
->
getTimeStamp
();
Scalar
Dt
=
getBuffer
().
get
().
back
().
ts_
-
origin_ptr_
->
getTimeStamp
();
xPlusDelta
(
origin_ptr_
->
getFramePtr
()
->
getState
(),
getBuffer
().
get
().
back
().
delta_integr_
,
Dt
,
_x
);
xPlusDelta
(
origin_ptr_
->
getFramePtr
()
->
getState
(),
getBuffer
().
get
().
back
().
delta_integr_
,
Dt
,
_x
);
}
}
inline
const
void
ProcessorMotion
::
getCurrentState
(
Eigen
::
VectorXs
&
_x
,
TimeStamp
&
_ts
)
inline
void
ProcessorMotion
::
getCurrentState
(
Eigen
::
VectorXs
&
_x
,
TimeStamp
&
_ts
)
{
{
getCurrentState
(
_x
);
getCurrentState
(
_x
);
_ts
=
getBuffer
().
get
().
back
().
ts_
;
_ts
=
getBuffer
().
get
().
back
().
ts_
;
...
...
This diff is collapsed.
Click to expand it.
src/processor_tracker.h
+
2
−
2
View file @
7b97ac52
...
@@ -85,7 +85,7 @@ class ProcessorTracker : public ProcessorBase
...
@@ -85,7 +85,7 @@ class ProcessorTracker : public ProcessorBase
virtual
void
process
(
CaptureBasePtr
const
_incoming_ptr
);
virtual
void
process
(
CaptureBasePtr
const
_incoming_ptr
);
void
setMaxNewFeatures
(
const
unsigned
int
&
_max_new_features
);
void
setMaxNewFeatures
(
const
unsigned
int
&
_max_new_features
);
const
unsigned
int
getMaxNewFeatures
();
unsigned
int
getMaxNewFeatures
();
virtual
bool
keyFrameCallback
(
FrameBasePtr
_keyframe_ptr
,
const
Scalar
&
_time_tol_other
);
virtual
bool
keyFrameCallback
(
FrameBasePtr
_keyframe_ptr
,
const
Scalar
&
_time_tol_other
);
...
@@ -195,7 +195,7 @@ inline void ProcessorTracker::setMaxNewFeatures(const unsigned int& _max_new_fea
...
@@ -195,7 +195,7 @@ inline void ProcessorTracker::setMaxNewFeatures(const unsigned int& _max_new_fea
max_new_features_
=
_max_new_features
;
max_new_features_
=
_max_new_features
;
}
}
inline
const
unsigned
int
ProcessorTracker
::
getMaxNewFeatures
()
inline
unsigned
int
ProcessorTracker
::
getMaxNewFeatures
()
{
{
return
max_new_features_
;
return
max_new_features_
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment