File tree Expand file tree Collapse file tree 3 files changed +15
-5
lines changed
Expand file tree Collapse file tree 3 files changed +15
-5
lines changed Original file line number Diff line number Diff line change @@ -53,14 +53,12 @@ void Maike::loadPath(DataSink& sink)
5353
5454ResourceObject Maike::resourceObjectCreate (ResourceObject::Type type)
5555 {
56- ResourceObjectJansson ret (type);
57- return std::move (ret);
56+ return ResourceObjectJansson (type);
5857 }
5958
6059ResourceObject Maike::resourceObjectCreate (DataSource& src)
6160 {
62- ResourceObjectJansson ret (src);
63- return std::move (ret);
61+ return ResourceObjectJansson (src);
6462 }
6563
6664void Maike::init (ExceptionHandler eh)
@@ -136,7 +134,11 @@ ResourceObject Maike::configDump(const Session& maike)
136134 {
137135 ResourceObjectJansson obj (ResourceObject::Type::OBJECT);
138136 maike.configDump (obj);
137+ #if defined(__GNUC__) && __GNUC__ < 13
139138 return std::move (obj);
139+ #else
140+ return obj;
141+ #endif
140142 }
141143
142144
@@ -555,7 +557,11 @@ ResourceObject Maike::targetsDump(const Session& maike)
555557 {
556558 ResourceObjectJansson db (ResourceObject::Type::ARRAY);
557559 maike.targetsProcess (TargetDumpJSON (db));
560+ #if defined(__GNUC__) && __GNUC__ < 13
558561 return std::move (db);
562+ #else
563+ return db;
564+ #endif
559565 }
560566
561567
Original file line number Diff line number Diff line change 4141 },
4242 "cflags_extra" :[],
4343 "cflags_format" :" -^" ,
44- "cxxversion_max" :201402 ,
44+ "cxxversion_max" :-1 ,
4545 "cxxversion_min" :201103 ,
4646 "dllcompile" :{
4747 "args" :[
Original file line number Diff line number Diff line change @@ -136,5 +136,9 @@ ResourceObject SystemTargetInfo::configDump() const
136136 {
137137 ResourceObjectJansson ret (ResourceObject::Type::OBJECT);
138138 configDump (ret);
139+ #if defined(__GNUC__) && __GNUC__ < 13
139140 return std::move (ret);
141+ #else
142+ return ret;
143+ #endif
140144 }
You can’t perform that action at this time.
0 commit comments