Skip to content

Commit 8ea0a32

Browse files
Add deprecated poly class to descriptor generation.
1 parent aa059c0 commit 8ea0a32

9 files changed

+28
-8
lines changed

Makefile

+1-1
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 polyXMLBase RESTProcess_base signature stringKeyMap xml_pack_base xml_unpack_base
8+
CDHEADERS=multiArray object poly polyBase polyRESTProcess polyRESTProcessBase polyXMLBase RESTProcess_base signature stringKeyMap xml_pack_base xml_unpack_base
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

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
#ifdef CLASSDESC_OBJECT_H
77
#include "object-RESTProcess.cd"
88
#endif
9+
#ifdef CLASSDESC_POLY_H
10+
#include "poly-RESTProcess.cd"
11+
#endif
912
#ifdef CLASSDESC_POLYBASE_H
1013
#include "polyBase-RESTProcess.cd"
1114
#endif

dump-allCDs.h

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
#ifdef CLASSDESC_OBJECT_H
77
#include "object-dump.cd"
88
#endif
9+
#ifdef CLASSDESC_POLY_H
10+
#include "poly-dump.cd"
11+
#endif
912
#ifdef CLASSDESC_POLYBASE_H
1013
#include "polyBase-dump.cd"
1114
#endif

json_pack-allCDs.h

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
#ifdef CLASSDESC_OBJECT_H
77
#include "object-json_pack.cd"
88
#endif
9+
#ifdef CLASSDESC_POLY_H
10+
#include "poly-json_pack.cd"
11+
#endif
912
#ifdef CLASSDESC_POLYBASE_H
1013
#include "polyBase-json_pack.cd"
1114
#endif

pack-allCDs.h

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
#ifdef CLASSDESC_OBJECT_H
77
#include "object-pack.cd"
88
#endif
9+
#ifdef CLASSDESC_POLY_H
10+
#include "poly-pack.cd"
11+
#endif
912
#ifdef CLASSDESC_POLYBASE_H
1013
#include "polyBase-pack.cd"
1114
#endif

poly.h

+6-7
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88

99
#ifndef CLASSDESC_POLY_H
1010
#define CLASSDESC_POLY_H
11-
// functionality in this file is completely deprecated in favour of
12-
// the Poly class in Poly.h
11+
/// @deprecated functionality in this file is completely deprecated in favour of
12+
// the Poly class in polyBase.h
1313
#include "object.h"
1414
#include "ref.h"
1515

1616
namespace classdesc
1717
{
1818

19-
/** empty concrete object type */
19+
/** @deprecated empty concrete object type */
2020
class Eobject: public Object<Eobject> {};
2121

22-
/**
22+
/** @deprecated
2323
A simple RTTI system that can be used, reimplemented and passed to polyref
2424
*/
2525
template <class T=Eobject>
@@ -38,7 +38,7 @@ namespace classdesc
3838

3939
template <class T> std::vector<T*> SimpleTypeTable<T>::data;
4040

41-
/** polymorphic smart pointer class - copies are deep */
41+
/** @deprecated polymorphic smart pointer class - copies are deep */
4242
template <class T=Eobject, class TT=SimpleTypeTable<T> >
4343
class poly
4444
{
@@ -93,7 +93,7 @@ namespace classdesc
9393
operator bool() const {return item!=NULL;}
9494
};
9595

96-
/** reference counted polymorphic smart pointer class - copies are shallow */
96+
/** @deprecated reference counted polymorphic smart pointer class - copies are shallow */
9797
template <class T=Eobject, class TT=SimpleTypeTable<T> >
9898
class polyref: public classdesc::ref<classdesc::poly<T,TT> >
9999
{
@@ -209,5 +209,4 @@ namespace std
209209
template <class T, class TT> void swap(classdesc::poly<T,TT>& x,classdesc::poly<T,TT>& y) {x.swap(y);}
210210
}
211211

212-
#include "poly.cd"
213212
#endif

random_init-allCDs.h

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
#ifdef CLASSDESC_OBJECT_H
77
#include "object-random_init.cd"
88
#endif
9+
#ifdef CLASSDESC_POLY_H
10+
#include "poly-random_init.cd"
11+
#endif
912
#ifdef CLASSDESC_POLYBASE_H
1013
#include "polyBase-random_init.cd"
1114
#endif

typeName-allCDs.h

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
#ifdef CLASSDESC_OBJECT_H
77
#include "object-typeName.cd"
88
#endif
9+
#ifdef CLASSDESC_POLY_H
10+
#include "poly-typeName.cd"
11+
#endif
912
#ifdef CLASSDESC_POLYBASE_H
1013
#include "polyBase-typeName.cd"
1114
#endif

xml_pack-allCDs.h

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
#ifdef CLASSDESC_OBJECT_H
77
#include "object-xml_pack.cd"
88
#endif
9+
#ifdef CLASSDESC_POLY_H
10+
#include "poly-xml_pack.cd"
11+
#endif
912
#ifdef CLASSDESC_POLYBASE_H
1013
#include "polyBase-xml_pack.cd"
1114
#endif

0 commit comments

Comments
 (0)