Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RobotAPI
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
Container Registry
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
RobotAPI
Commits
b7982a3a
Commit
b7982a3a
authored
4 years ago
by
Rainer Kartmann
Browse files
Options
Downloads
Patches
Plain Diff
Rename ArmemError to ArMemError
parent
b51ec1cb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!89
Implement core data structure of ArMem Memories
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/RobotAPI/libraries/armem/error/ArmemError.cpp
+5
-5
5 additions, 5 deletions
source/RobotAPI/libraries/armem/error/ArmemError.cpp
source/RobotAPI/libraries/armem/error/ArmemError.h
+6
-6
6 additions, 6 deletions
source/RobotAPI/libraries/armem/error/ArmemError.h
with
11 additions
and
11 deletions
source/RobotAPI/libraries/armem/error/ArmemError.cpp
+
5
−
5
View file @
b7982a3a
...
...
@@ -19,14 +19,14 @@ namespace armarx::armem::error
{
Ar
m
emError
::
Ar
m
emError
(
const
std
::
string
&
msg
)
:
std
::
runtime_error
(
msg
)
Ar
M
emError
::
Ar
M
emError
(
const
std
::
string
&
msg
)
:
std
::
runtime_error
(
msg
)
{
}
StorageNameMismatch
::
StorageNameMismatch
(
const
std
::
string
&
expectedName
,
const
std
::
string
&
ownTerm
,
const
std
::
string
&
storageName
)
:
Ar
m
emError
(
makeMsg
(
expectedName
,
ownTerm
,
storageName
))
Ar
M
emError
(
makeMsg
(
expectedName
,
ownTerm
,
storageName
))
{}
std
::
string
StorageNameMismatch
::
makeMsg
(
...
...
@@ -39,7 +39,7 @@ namespace armarx::armem::error
StorageEntryAlreadyExists
::
StorageEntryAlreadyExists
(
const
std
::
string
&
existingTerm
,
const
std
::
string
&
existingName
,
const
std
::
string
&
ownTerm
,
const
std
::
string
&
ownName
)
:
Ar
m
emError
(
makeMsg
(
existingTerm
,
existingName
,
ownTerm
,
ownName
))
Ar
M
emError
(
makeMsg
(
existingTerm
,
existingName
,
ownTerm
,
ownName
))
{
}
...
...
@@ -54,7 +54,7 @@ namespace armarx::armem::error
MissingEntry
::
MissingEntry
(
const
std
::
string
&
missingTerm
,
const
std
::
string
&
missingName
,
const
std
::
string
&
ownTerm
,
const
std
::
string
&
ownName
)
:
Ar
m
emError
(
makeMsg
(
missingTerm
,
missingName
,
ownTerm
,
ownName
))
Ar
M
emError
(
makeMsg
(
missingTerm
,
missingName
,
ownTerm
,
ownName
))
{
}
...
...
@@ -70,7 +70,7 @@ namespace armarx::armem::error
ParseIntError
::
ParseIntError
(
std
::
string
string
,
std
::
string
semanticName
)
:
Ar
m
emError
(
makeMsg
(
string
,
semanticName
))
Ar
M
emError
(
makeMsg
(
string
,
semanticName
))
{
}
...
...
This diff is collapsed.
Click to expand it.
source/RobotAPI/libraries/armem/error/ArmemError.h
+
6
−
6
View file @
b7982a3a
...
...
@@ -9,11 +9,11 @@ namespace armarx::armem::error
/**
* @brief Base class for all exceptions thrown by the armem library.
*/
class
Ar
m
emError
:
public
std
::
runtime_error
class
Ar
M
emError
:
public
std
::
runtime_error
{
public:
Ar
m
emError
(
const
std
::
string
&
msg
);
Ar
M
emError
(
const
std
::
string
&
msg
);
};
...
...
@@ -21,7 +21,7 @@ namespace armarx::armem::error
/**
* @brief Indicates that a name in a given ID does not match a storage's own name.
*/
class
StorageNameMismatch
:
public
Ar
m
emError
class
StorageNameMismatch
:
public
Ar
M
emError
{
public:
...
...
@@ -37,7 +37,7 @@ namespace armarx::armem::error
/**
* @brief Indicates that a name in a given ID does not match a storage's own name.
*/
class
StorageEntryAlreadyExists
:
public
Ar
m
emError
class
StorageEntryAlreadyExists
:
public
Ar
M
emError
{
public:
...
...
@@ -53,7 +53,7 @@ namespace armarx::armem::error
/**
* @brief Indicates that a storage did not have an entry under a given name.
*/
class
MissingEntry
:
public
Ar
m
emError
class
MissingEntry
:
public
Ar
M
emError
{
public:
MissingEntry
(
const
std
::
string
&
missingTerm
,
const
std
::
string
&
missingName
,
...
...
@@ -67,7 +67,7 @@ namespace armarx::armem::error
/**
* @brief Indicates that a storage did not have an entry under a given name.
*/
class
ParseIntError
:
public
Ar
m
emError
class
ParseIntError
:
public
Ar
M
emError
{
public:
ParseIntError
(
std
::
string
string
,
std
::
string
semanticName
);
...
...
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