Skip to content

Commit e72a20b

Browse files
highperformancecoderhighperformancecoder
committed
Refactored auto generated CD files for Classdesc headers.
1 parent 1277d9d commit e72a20b

33 files changed

+392
-184
lines changed

‎Makefile

+31-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ CPLUSPLUS=g++
55
# -I/usr/include/tirpc is needed for Fedora
66
FLAGS=-g -I. -I/usr/include/tirpc
77

8+
CDHEADERS=multiArray object polyBase polyRESTProcess polyRESTProcessBase signature stringKeyMap
9+
DESCRIPTORS=dump pack json_pack random_init RESTProcess xml_pack typeName
10+
CDFILES=$(foreach d,$(DESCRIPTORS),$(foreach h,$(CDHEADERS),$(h)-$(d).cd))
11+
812
ifdef GCOV
913
GCOV_FLAGS+=-fprofile-arcs -ftest-coverage
1014
FLAGS+=-fprofile-arcs -ftest-coverage
@@ -97,7 +101,7 @@ else
97101
XDRPACK=
98102
endif
99103

100-
build: $(EXES) $(XDRPACK) functiondb.h unpack_base.h json_unpack_base.h
104+
build: $(EXES) $(DESCRIPTORS:%=%-allCDs.h) $(CDFILES) $(XDRPACK) functiondb.h unpack_base.h json_unpack_base.h
101105

102106
unpack_base.h:
103107
-ln -s pack_base.h unpack_base.h
@@ -130,7 +134,7 @@ functiondb.h: functiondb.sh
130134
bash $< >$@
131135

132136
clean:
133-
rm -f *.o *~ "\#*\#" core *.exh *.exc *.d *,D *.exe
137+
rm -f *.o *~ "\#*\#" core *.cd *.exh *.exc *.d *,D *.exe
134138
rm -rf $(EXES) include-paths cxx_repository
135139
cd mpi-examples && $(MAKE) clean
136140
cd examples && $(MAKE) clean
@@ -186,6 +190,31 @@ travis-test: build
186190
dist:
187191
sh makeDist.sh
188192

193+
# cd file generation rules
194+
$(DESCRIPTORS:%=%-allCDs.h): Makefile
195+
createCDs.sh $(subst -allCDs.h,,$@) $(CDHEADERS)
196+
197+
%-dump.cd: %.h
198+
classdesc -nodef -onbase -i $< dump >$@
199+
200+
%-pack.cd: %.h
201+
classdesc -nodef -onbase -i $< pack unpack >$@
202+
203+
%-json_pack.cd: %.h
204+
classdesc -nodef -onbase -i $< json_pack json_unpack >$@
205+
206+
%-xml_pack.cd: %.h
207+
classdesc -nodef -onbase -i $< xml_pack xml_unpack >$@
208+
209+
%-random_init.cd: %.h
210+
classdesc -nodef -onbase -i $< random_init >$@
211+
212+
%-RESTProcess.cd: %.h
213+
classdesc -nodef -onbase -i $< RESTProcess >$@
214+
215+
%-typeName.cd: %.h
216+
classdesc -nodef -typeName -i $< >$@
217+
189218
# install documentation on SourceForge
190219
DOCPREFIX=web.sf.net:/home/project-web/classdesc/htdocs/doc
191220

‎RESTProcess-allCDs.h

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#ifdef CLASSDESC_MULTIARRAY_H
2+
#include "multiArray-RESTProcess.cd"
3+
#endif
4+
#ifdef CLASSDESC_OBJECT_H
5+
#include "object-RESTProcess.cd"
6+
#endif
7+
#ifdef CLASSDESC_POLYBASE_H
8+
#include "polyBase-RESTProcess.cd"
9+
#endif
10+
#ifdef CLASSDESC_POLYRESTPROCESS_H
11+
#include "polyRESTProcess-RESTProcess.cd"
12+
#endif
13+
#ifdef CLASSDESC_POLYRESTPROCESSBASE_H
14+
#include "polyRESTProcessBase-RESTProcess.cd"
15+
#endif
16+
#ifdef CLASSDESC_SIGNATURE_H
17+
#include "signature-RESTProcess.cd"
18+
#endif
19+
#ifdef CLASSDESC_STRINGKEYMAP_H
20+
#include "stringKeyMap-RESTProcess.cd"
21+
#endif

‎RESTProcessExample/RESTProcessExpected.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/root=>{"bar":{"a":0.1,"af":0.2000000029802322,"b":3,"barfoo":"eb","bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","f":20,"h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"mFoo":[{"first":"foo","second":{"a":0.1,"af":0.2000000029802322,"b":2,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]}}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vFoo":[{"a":0.1,"af":0.2000000029802322,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]},{"a":0.1,"af":0.2000000029802322,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]},{"a":0.1,"af":0.2000000029802322,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]}],"vs":[" hello"," hello"]},"bar1":{"barfoo":"ec","f":{"a":0.1,"af":0.2000000029802322,"b":2,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]},"fp":{"a":0,"af":0,"b":0,"bf":false,"bt":false,"c":"","c1":[],"ch":"\u0000","d":[0,0,0],"d1":[[0,0],[0,0],[0,0]],"ef":"ea","h":[],"l":[],"llex":[],"m":[],"m_rotation":0,"sef":{},"sm":{},"ss":[],"um":[],"vs":[]},"g":2,"vFoo":[{"a":0.1,"af":0.2000000029802322,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]},{"a":0.1,"af":0.2000000029802322,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]}]},"defaultless":{},"sbar":{"a":0,"af":0,"b":0,"barfoo":"ea","bf":false,"bt":false,"c":"","c1":[],"ch":"\u0000","d":[0,0,0],"d1":[[0,0],[0,0],[0,0]],"ef":"ea","f":0,"h":[],"l":[],"llex":[],"m":[],"mFoo":[],"m_rotation":0,"sef":{},"sm":{},"ss":[],"um":[],"vFoo":[],"vs":[]},"spoly":{}}
1+
/root=>{"bar":{"a":0.1,"af":0.2000000029802322,"b":3,"barfoo":"eb","bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","f":20,"h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"mFoo":[{"first":"foo","second":{"a":0.1,"af":0.2000000029802322,"b":2,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]}}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vFoo":[{"a":0.1,"af":0.2000000029802322,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]},{"a":0.1,"af":0.2000000029802322,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]},{"a":0.1,"af":0.2000000029802322,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]}],"vs":[" hello"," hello"]},"bar1":{"barfoo":"ec","f":{"a":0.1,"af":0.2000000029802322,"b":2,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]},"fp":{"a":0,"af":0,"b":0,"bf":false,"bt":false,"c":"","c1":[],"ch":"\u0000","d":[0,0,0],"d1":[[0,0],[0,0],[0,0]],"ef":"ea","h":[],"l":[],"llex":[],"m":[],"m_rotation":0,"sef":{},"sm":{},"ss":[],"um":[],"vs":[]},"g":2,"vFoo":[{"a":0.1,"af":0.2000000029802322,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]},{"a":0.1,"af":0.2000000029802322,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]}]},"defaultless":{},"sbar":{"a":0,"af":0,"b":0,"barfoo":"ea","bf":false,"bt":false,"c":"","c1":[],"ch":"\u0000","d":[0,0,0],"d1":[[0,0],[0,0],[0,0]],"ef":"ea","f":0,"h":[],"l":[],"llex":[],"m":[],"mFoo":[],"m_rotation":0,"sef":{},"sm":{},"ss":[],"um":[],"vFoo":[],"vs":[]},"spoly":{"base___classdesc__PolyRESTProcessBase":{}}}
22
/root/bar/csi=>20
33
/root/bar/csi=>Exception: attempt to alter a const variable
44
/root/bar/si=>0

‎RESTProcess_base.h

+48-45
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ namespace classdesc
3131
using RPPtr=std::shared_ptr<RESTProcessBase>;
3232

3333
struct RESTProcess_t;
34+
35+
template <class T>
36+
typename enable_if<Not<functional::is_nonmember_function_ptr<T>>, void>::T
37+
RESTProcess(RESTProcess_t&, const std::string&, T&);
3438

3539
/// interface for the REST processor
3640
class RESTProcessBase
@@ -133,8 +137,8 @@ namespace classdesc
133137
{
134138
std::vector<std::shared_ptr<RESTProcessFunctionBase>> overloadedFunctions;
135139
RPPtr process(const string& remainder, const REST_PROCESS_BUFFER& arguments) override;
136-
REST_PROCESS_BUFFER asBuffer() const {return {};}
137-
std::vector<Signature> signature() const {
140+
REST_PROCESS_BUFFER asBuffer() const override {return {};}
141+
std::vector<Signature> signature() const override {
138142
std::vector<Signature> r;
139143
for (auto& i: overloadedFunctions) {
140144
auto s=i->signature();
@@ -379,7 +383,7 @@ namespace classdesc
379383
}
380384
}
381385

382-
std::shared_ptr<classdesc::RESTProcessBase> process(const std::string& query, const REST_PROCESS_BUFFER& jin);
386+
inline RPPtr process(const std::string& query, const REST_PROCESS_BUFFER& jin);
383387

384388
/// define all arguments of \a F
385389
template <class F> void defineFunctionArgTypes()
@@ -400,22 +404,8 @@ namespace classdesc
400404
(const std::string& typeName,const std::function<void(const std::string& objName)>& callback=nullptr);
401405
};
402406

403-
404407
template <class T>
405-
inline RPPtr mapAndProcess(const string& query, const REST_PROCESS_BUFFER& arguments, T& a)
406-
{
407-
RESTProcess_t map;
408-
RESTProcess(map,"",a);
409-
if (query.empty())
410-
{
411-
auto i=map.find("");
412-
if (i!=map.end())
413-
return i->second->process("",arguments);
414-
else
415-
return {};
416-
}
417-
return map.process(query,arguments);
418-
}
408+
RPPtr mapAndProcess(const string& query, const REST_PROCESS_BUFFER& arguments, T& a);
419409

420410
template <class T>
421411
inline typename enable_if<is_default_constructible<T>,RPPtr>::T
@@ -504,7 +494,7 @@ namespace classdesc
504494
{return std::make_shared<RESTProcessValueObject<std::vector<std::string>>>(init);}
505495

506496
/// class that represents the void, or null object
507-
class RESTProcessVoid: public RESTProcessBase
497+
struct RESTProcessVoid: public RESTProcessBase
508498
{
509499
std::shared_ptr<RESTProcessBase> process(const string&, const REST_PROCESS_BUFFER&) override
510500
{return std::make_shared<RESTProcessVoid>();}
@@ -532,27 +522,21 @@ namespace classdesc
532522
template <class T>
533523
struct is_classdescGenerated:
534524
public And<
535-
And<
536-
is_class<T>,
537-
Not<is_container<T>>
538-
>,
539-
Not<is_smart_ptr<T>>
525+
is_class<T>,
526+
Not<is_container<T>>,
527+
Not<is_smart_ptr<T>>,
528+
Not<is_string<T>>
540529
> {};
541530

542-
/// descriptor for generating building REST processing registry
543-
template <class T>
544-
typename enable_if<Not<functional::is_nonmember_function_ptr<T>>, void>::T
545-
RESTProcess(RESTProcess_t& r, const string& d, T& a) {RESTProcessp(r,d,a);}
546-
547531

548532
template <class T>
549533
void RESTProcessp(RESTProcess_t& repo, const string& d, Exclude<T>& a)
550534
{}
551535

552536
template <class T>
553-
typename enable_if<is_fundamental<T>, void>::T
537+
typename enable_if<Or<is_fundamental<T>,is_string<T>>, void>::T
554538
RESTProcessp(RESTProcess_t& repo, const string& d, T& a)
555-
{repo.add(d, new RESTProcessObject<T>(a));}
539+
{repo.emplace(d, makeRESTProcessRef(a));}
556540

557541
template <class T>
558542
void RESTProcessp(RESTProcess_t& repo, const string& d, T* a)
@@ -572,7 +556,7 @@ namespace classdesc
572556
template <class U>
573557
typename enable_if<is_default_constructible<typename U::value_type>, typename U::value_type&>::T
574558
dummyRef() {
575-
static typename U::value_type dummy;
559+
static typename U::value_type dummy{};
576560
return dummy;
577561
}
578562

@@ -640,13 +624,13 @@ namespace classdesc
640624
}
641625

642626
// common element extraction code - assumes index is in bounds
643-
typename T::value_type& elemCommon(size_t idx) {
627+
typename transfer_const<T, typename T::value_type>::type& elemCommon(size_t idx) {
644628
auto i=obj.begin();
645629
std::advance(i, idx);
646630
return *i;
647631
}
648632

649-
typename T::value_type& elemNoThrow(size_t idx) {
633+
typename transfer_const<T, typename T::value_type>::type& elemNoThrow(size_t idx) {
650634
if (idx<obj.size()) return elemCommon(idx);
651635
return dummyRef<T>();
652636
}
@@ -658,6 +642,9 @@ namespace classdesc
658642
template <class U>
659643
typename enable_if<has_member_erase<U,typename U::iterator(U::*)(typename U::const_iterator)>,void>::T
660644
erase(U& o,typename U::iterator i) {o.erase(i);}
645+
646+
template <class U>
647+
void erase(U& o,typename U::const_iterator i) {}
661648

662649
template <class U>
663650
typename enable_if<Not<has_member_erase<U,typename U::iterator(U::*)(typename U::const_iterator)>>,void>::T
@@ -673,7 +660,7 @@ namespace classdesc
673660

674661

675662
protected:
676-
typename T::value_type& elem(size_t idx) {
663+
typename transfer_const<T, typename T::value_type>::type& elem(size_t idx) {
677664
if (idx<obj.size()) return elemCommon(idx);
678665
throw std::runtime_error("idx out of bounds");
679666
}
@@ -687,11 +674,11 @@ namespace classdesc
687674
std::string type() const override {return typeName<T>();}
688675
REST_PROCESS_BUFFER asBuffer() const override {REST_PROCESS_BUFFER r; return r<<obj;}
689676
bool isObject() const override {return true;}
690-
RPPtr getElem(const REST_PROCESS_BUFFER& index) {
677+
RPPtr getElem(const REST_PROCESS_BUFFER& index) override {
691678
size_t idx; index>>idx;
692679
return makeRESTProcessRef(elem(idx));
693680
}
694-
RPPtr setElem(const REST_PROCESS_BUFFER& index, const REST_PROCESS_BUFFER& value) {
681+
RPPtr setElem(const REST_PROCESS_BUFFER& index, const REST_PROCESS_BUFFER& value) override {
695682
size_t idx; index>>idx;
696683
auto& v=elem(idx);
697684
value>>v;
@@ -884,7 +871,7 @@ namespace classdesc
884871
template <class T, class Enable=void> struct MappedType;
885872
template <class T> struct MappedType // for maps
886873
<T, typename enable_if<is_pair<typename T::value_type>, void>::T>
887-
{using type=typename T::mapped_type;};
874+
{using type=typename T::value_type::second_type;};
888875

889876
template <class T> struct MappedType // for sets
890877
<T, typename enable_if<Not<is_pair<typename T::value_type>>, void>::T>
@@ -913,9 +900,22 @@ namespace classdesc
913900
const typename std::iterator_traits<I>::value_type&>::T
914901
elem_of(const I& i) const {return *i;}
915902

916-
typename MappedType<T>::type& elem(const typename T::key_type& k)
903+
template <class U>
904+
typename enable_if<Not<is_const<U>>, typename MappedType<U>::type&>::T elemImpl(const typename U::key_type& k)
917905
{return elem_of(obj.emplace(makeElement<T>(k)).first);}
918-
906+
907+
template <class U>
908+
typename enable_if<is_const<U>, typename MappedType<U>::type&>::T elemImpl(const typename U::key_type& k)
909+
{
910+
auto i=obj.find(k);
911+
if (i==obj.end()) return dummyRef<std::vector<typename MappedType<U>::type>>();
912+
return elem_of(i);
913+
}
914+
915+
typename MappedType<T>::type& elem(const typename T::key_type& k)
916+
{return elemImpl<T>(k);}
917+
918+
919919
public:
920920
RESTProcessAssociativeContainer(T& obj): obj(obj) {}
921921
RPPtr process(const string& remainder, const REST_PROCESS_BUFFER& arguments) override;
@@ -924,11 +924,11 @@ namespace classdesc
924924
std::string type() const override {return typeName<T>();}
925925
REST_PROCESS_BUFFER asBuffer() const override {REST_PROCESS_BUFFER r; return r<<obj;}
926926
bool isObject() const override {return true;}
927-
RPPtr getElem(const REST_PROCESS_BUFFER& index) {
927+
RPPtr getElem(const REST_PROCESS_BUFFER& index) override {
928928
typename T::key_type idx; index>>idx;
929929
return makeRESTProcessRef(elem(idx));
930930
}
931-
RPPtr setElem(const REST_PROCESS_BUFFER& index, const REST_PROCESS_BUFFER& value) {
931+
RPPtr setElem(const REST_PROCESS_BUFFER& index, const REST_PROCESS_BUFFER& value) override {
932932
typename T::key_type idx; index>>idx;
933933
auto& v=elem(idx);
934934
value>>v;
@@ -1392,7 +1392,7 @@ namespace classdesc
13921392
Not<is_void<U>>
13931393
>,RESTProcess_t>::T
13941394
slist() const {
1395-
typename remove_reference<U>::type x;
1395+
typename remove_reference<U>::type x{};
13961396
return RESTProcessObject<U>(x).list();
13971397
}
13981398
// for now, we cannot extract the lists of a non-default constructible return type
@@ -1447,7 +1447,10 @@ namespace classdesc
14471447
repo.defineFunctionArgTypes<F>();
14481448
}
14491449

1450-
template <>
1450+
template <class F> std::shared_ptr<RESTProcessFunction<F>>
1451+
makeRESTProcessFunction(F f)
1452+
{return std::make_shared<RESTProcessFunction<F>>(f);}
1453+
14511454
inline void RESTProcess(RESTProcess_t& repo, const string& d, const char*& a)
14521455
{repo.add(d,new RESTProcessObject<const char*>(a));}
14531456

@@ -1478,7 +1481,7 @@ namespace classdesc
14781481
std::vector<Signature> signature() const override;
14791482
RESTProcess_t list() const override {return {};}
14801483
std::string type() const override {return typeName<E>();}
1481-
REST_PROCESS_BUFFER asBuffer() const {return REST_PROCESS_BUFFER(enum_keys<E>()(e));}
1484+
REST_PROCESS_BUFFER asBuffer() const override {return REST_PROCESS_BUFFER(enum_keys<E>()(e));}
14821485
};
14831486

14841487
template <class E>

0 commit comments

Comments
 (0)