Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
CxxClient
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TGenBase
CxxClient
Commits
c6918fe9
Commit
c6918fe9
authored
5 years ago
by
Evgeny Lavrik
Browse files
Options
Downloads
Patches
Plain Diff
Tweaks for root
parent
93eb9081
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
TGenBaseClient/BaseClass.h
+10
-1
10 additions, 1 deletion
TGenBaseClient/BaseClass.h
TGenBaseClient/Utils.h
+3
-0
3 additions, 0 deletions
TGenBaseClient/Utils.h
with
13 additions
and
1 deletion
TGenBaseClient/BaseClass.h
+
10
−
1
View file @
c6918fe9
...
...
@@ -91,7 +91,11 @@ static T* FromJsonString(std::string jsonString) {
}
}
#ifdef TGENBASECLIENT_WITH_ROOT
class
BaseClass
:
public
TObject
#else
class
BaseClass
#endif
{
public:
virtual
std
::
string
FullClassName
()
{
...
...
@@ -218,12 +222,17 @@ class BaseCondition: public BaseClass {
return
TGenBase
::
FromJson
<
BaseCondition
>
(
json
);
}
std
::
string
GetName
()
const
{
return
fName
;
};
#ifdef TGENBASECLIENT_WITH_ROOT
virtual
const
char
*
GetName
()
const
{
return
fName
.
c_str
();
};
#else
virtual
std
::
string
GetName
()
const
{
return
fName
;
};
#endif
std
::
map
<
std
::
string
,
std
::
string
>
GetMetadata
()
const
{
return
fMetadata
;
}
int
GetRunId
()
const
{
return
fRunId
;
}
int
GetVersion
()
const
{
return
fVersion
;
}
void
SetName
(
std
::
string
value
)
{
fName
=
value
;
};
void
SetName
(
char
*
value
)
{
fName
=
value
;
};
void
SetMetadata
(
std
::
map
<
std
::
string
,
std
::
string
>
value
)
{
fMetadata
=
value
;
}
void
SetRunId
(
int
value
)
{
fRunId
=
value
;
}
void
SetVersion
(
int
value
)
{
fVersion
=
value
;
}
...
...
This diff is collapsed.
Click to expand it.
TGenBaseClient/Utils.h
+
3
−
0
View file @
c6918fe9
...
...
@@ -98,6 +98,8 @@ namespace jsoncons \
}; \
};
#ifdef TGENBASECLIENT_WITH_ROOT
#include
"TString.h"
namespace
jsoncons
{
...
...
@@ -268,5 +270,6 @@ namespace jsoncons {
// struct is_json_type_traits_declared<std::map<Integer,T>, typename std::enable_if<std::is_integral<Integer>::value>::type> : public std::true_type {};
// }
#endif
#endif
/* !TGENBASECLIENTUTILS_H */
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