Skip to content

Commit 0d9af32

Browse files
highperformancecoderhighperformancecoder
committed
More refinements of epilogue structure.
1 parent 433450d commit 0d9af32

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+151
-191
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ 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
8+
CDHEADERS=multiArray object polyBase polyRESTProcess polyRESTProcessBase RESTProcess_base signature stringKeyMap
99
DESCRIPTORS=dump pack json_pack random_init RESTProcess xml_pack typeName
1010
CDFILES=$(foreach d,$(DESCRIPTORS),$(foreach h,$(CDHEADERS),$(h)-$(d).cd))
1111

‎RESTProcess-allCDs.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
#ifdef CLASSDESC_POLYRESTPROCESSBASE_H
1616
#include "polyRESTProcessBase-RESTProcess.cd"
1717
#endif
18+
#ifdef CLASSDESC_RESTPROCESS_BASE_H
19+
#include "RESTProcess_base-RESTProcess.cd"
20+
#endif
1821
#ifdef CLASSDESC_SIGNATURE_H
1922
#include "signature-RESTProcess.cd"
2023
#endif

‎RESTProcess_base.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
Open source licensed under the MIT license. See LICENSE for details.
77
*/
88

9-
#ifndef RESTPROCESS_H
10-
#define RESTPROCESS_H
9+
#ifndef CLASSDESC_RESTPROCESS_BASE_H
10+
#define CLASSDESC_RESTPROCESS_BASE_H
1111
/// A classdesc descriptor to generate virtual xrap processing calls
1212
#include "function.h"
1313
#include "multiArray.h"

‎RESTProcess_epilogue.h‎

Lines changed: 5 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
66
Open source licensed under the MIT license. See LICENSE for details.
77
*/
8-
#ifndef RESTPROCESS_EPILOGUE_H
9-
#define RESTPROCESS_EPILOGUE_H
8+
#ifndef CLASSDESC_RESTPROCESS_EPILOGUE_H
9+
#define CLASSDESC_RESTPROCESS_EPILOGUE_H
1010
#include "RESTProcess_base.h"
1111
#include "signature.h"
1212
#include "multiArray.h"
1313
#include "polyPackBase.h"
1414
#include "polyRESTProcess.h"
15+
#include "RESTProcess-allCDs.h"
1516

1617
namespace classdesc_access
1718
{
@@ -565,48 +566,12 @@ namespace classdesc_access
565566
};
566567
#endif
567568

568-
#ifdef JSON_PACK_BASE_H
569+
#ifdef CLASSDESC_JSON_PACK_BASE_H
569570
template <>
570571
struct access_RESTProcess<cd::json_pack_t>: public cd::NullDescriptor<cd::RESTProcess_t> {};
571-
// template <>
572-
// struct access_RESTProcess<cd::RESTProcessBase>: public cd::NullDescriptor<cd::RESTProcess_t> {};
573-
// template <>
574-
// struct access_json_pack<cd::RESTProcessBase>: public cd::NullDescriptor<cd::json_pack_t> {};
575-
// template <>
576-
// struct access_json_unpack<cd::RESTProcessBase>: public cd::NullDescriptor<cd::json_unpack_t> {};
577572
#endif
578-
579-
#ifdef OBJECT_H
580-
template <>
581-
struct access_RESTProcess<cd::object>: public cd::NullDescriptor<cd::RESTProcess_t> {};
582-
#endif
583-
573+
584574
}
585575

586576

587-
#ifdef CLASSDESC_MULTIARRAY_H
588-
#include "multiArray-RESTProcess.cd"
589-
#endif
590-
591-
#ifdef CLASSDESC_OBJECT_H
592-
#include "object-RESTProcess.cd"
593-
#endif
594-
595-
#ifdef CLASSDESC_POLY_BASE_H
596-
#include "polyBase-RESTProcess.cd"
597-
#endif
598-
599-
#ifdef CLASSDESC_POLYRESTPROCESSBASE_H
600-
#include "polyRESTProcessBase-RESTProcess.cd"
601-
#endif
602-
603-
#ifdef CLASSDESC_POLYRESTPROCESS_H
604-
#include "polyRESTProcess-RESTProcess.cd"
605-
#endif
606-
607-
#ifdef CLASSDESC_SIGNATURE_H
608-
#include "signature-RESTProcess.cd"
609-
#endif
610-
611-
612577
#endif

‎Realloc.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
a version of their choice.
1313
*/
1414
#include <iostream>
15-
#ifndef REALLOC_H
16-
#define REALLOC_H
15+
#ifndef CLASSDESC_REALLOC_H
16+
#define CLASSDESC_REALLOC_H
1717
#include <cstdlib>
1818
namespace classdesc
1919
{

‎classdesc_epilogue.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,35 +26,35 @@ namespace
2626

2727
#include "typeName_epilogue.h"
2828

29-
#ifdef PACK_BASE_H
29+
#ifdef CLASSDESC_PACK_BASE_H
3030
#include "pack_epilogue.h"
3131
#endif
3232

33-
#ifdef XML_COMMON_H
33+
#ifdef CLASSDESC_XML_COMMON_H
3434
#include "xml_pack_epilogue.h"
3535
#endif
3636

37-
#ifdef DUMP_BASE_H
37+
#ifdef CLASSDESC_DUMP_BASE_H
3838
#include "dump_epilogue.h"
3939
#endif
4040

41-
#ifdef JAVACLASS_BASE_H
41+
#ifdef CLASSDESC_JAVACLASS_BASE_H
4242
#include "javaClass_epilogue.h"
4343
#endif
4444

45-
#ifdef JSON_PACK_BASE_H
45+
#ifdef CLASSDESC_JSON_PACK_BASE_H
4646
#include "json_pack_epilogue.h"
4747
#endif
4848

49-
#ifdef RANDOM_INIT_BASE_H
49+
#ifdef CLASSDESC_RANDOM_INIT_BASE_H
5050
#include "random_init_epilogue.h"
5151
#endif
5252

53-
#ifdef PYTHON_BASE_H
53+
#ifdef CLASSDESC_PYTHON_BASE_H
5454
#include "python_epilogue.h"
5555
#endif
5656

57-
#ifdef RESTPROCESS_H
57+
#ifdef CLASSDESC_RESTPROCESS_BASE_H
5858
#include "RESTProcess_epilogue.h"
5959
#endif
6060

‎dump-allCDs.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
#ifdef CLASSDESC_POLYRESTPROCESSBASE_H
1616
#include "polyRESTProcessBase-dump.cd"
1717
#endif
18+
#ifdef CLASSDESC_RESTPROCESS_BASE_H
19+
#include "RESTProcess_base-dump.cd"
20+
#endif
1821
#ifdef CLASSDESC_SIGNATURE_H
1922
#include "signature-dump.cd"
2023
#endif

‎dump_base.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
\brief textual representation descriptor
1111
*/
1212

13-
#ifndef DUMP_BASE_H
14-
#define DUMP_BASE_H
13+
#ifndef CLASSDESC_DUMP_BASE_H
14+
#define CLASSDESC_DUMP_BASE_H
1515

1616
#include <iostream>
1717
#include <sstream>

‎dump_epilogue.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
Open source licensed under the MIT license. See LICENSE for details.
77
*/
88

9-
#ifndef DUMP_EPILOGUE_H
10-
#define DUMP_EPILOGUE_H
9+
#ifndef CLASSDESC_DUMP_EPILOGUE_H
10+
#define CLASSDESC_DUMP_EPILOGUE_H
1111

1212

1313
#include <iostream>
@@ -75,28 +75,28 @@ namespace classdesc_access
7575
// public cd::NullDescriptor<cd::dump_t> {};
7676
//#endif
7777

78-
#ifdef POLYPACKBASE_H
78+
#ifdef CLASSDESC_POLYPACKBASE_H
7979
template <> struct access_dump<cd::PolyPackBase>:
8080
public cd::NullDescriptor<cd::dump_t> {};
8181
template <class T> struct access_dump<cd::PolyPack<T> >:
8282
public cd::NullDescriptor<cd::dump_t> {};
8383
#endif
8484

85-
#ifdef POLYJSONBASE_H
85+
#ifdef CLASSDESC_POLYJSONBASE_H
8686
template <> struct access_dump<cd::PolyJsonBase>:
8787
public cd::NullDescriptor<cd::dump_t> {};
8888
template <class T> struct access_dump<cd::PolyJson<T> >:
8989
public cd::NullDescriptor<cd::dump_t> {};
9090
#endif
9191

92-
#ifdef POLYXMLBASE_H
92+
#ifdef CLASSDESC_POLYXMLBASE_H
9393
template <> struct access_dump<cd::PolyXMLBase>:
9494
public cd::NullDescriptor<cd::dump_t> {};
9595
template <class T> struct access_dump<cd::PolyXML<T> >:
9696
public cd::NullDescriptor<cd::dump_t> {};
9797
#endif
9898

99-
#ifdef FACTORY_H
99+
#ifdef CLASSDESC_FACTORY_H
100100
template <class T, class U> struct access_dump<cd::Factory<T,U> >
101101
{
102102
void operator()(cd::dump_t& b,const cd::string& d, cd::Factory<T,U>& a)

‎factory.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
Open source licensed under the MIT license. See LICENSE for details.
77
*/
88

9-
#ifndef FACTORY_H
10-
#define FACTORY_H
9+
#ifndef CLASSDESC_FACTORY_H
10+
#define CLASSDESC_FACTORY_H
1111
#include "classdesc.h"
1212
#include <sstream>
1313

0 commit comments

Comments
 (0)