Skip to content

Commit a28c0df

Browse files
author
Nicholas Reed
committed
remove references to OODB/O3DB as in mpictor git repo ca0824d and d067534 
1 parent 8c8f2a1 commit a28c0df

51 files changed

Lines changed: 0 additions & 408 deletions

Some content is hidden

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

‎src/clSchemas/example/SdaiEXAMPLE_SCHEMA.cc‎

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ extern ofstream * logStream;
1616

1717
static int debug_access_hooks = 0;
1818

19-
#ifdef PART26
20-
21-
const char * sclHostName = CORBA::Orbix.myHost(); // Default is local host
22-
#endif
23-
2419
Schema * s_example_schema = 0;
2520

2621
/* ************** TYPES */
@@ -126,15 +121,6 @@ SdaiPoly_line::SdaiPoly_line( SdaiPoly_line & e ) {
126121
}
127122
SdaiPoly_line::~SdaiPoly_line() { }
128123

129-
130-
#ifdef __O3DB__
131-
void
132-
SdaiPoly_line::oodb_reInit() {
133-
eDesc = example_schemae_poly_line;
134-
attributes [0].aDesc = a_0points;
135-
}
136-
#endif
137-
138124
SdaiPoly_line::SdaiPoly_line( SCLP23( Application_instance ) *se, int * addAttrs ) {
139125
/* Set this to point to the head entity. */
140126
HeadEntity( se );
@@ -199,17 +185,6 @@ SdaiShape::SdaiShape( SdaiShape & e ) {
199185
}
200186
SdaiShape::~SdaiShape() { }
201187

202-
203-
#ifdef __O3DB__
204-
void
205-
SdaiShape::oodb_reInit() {
206-
eDesc = example_schemae_shape;
207-
attributes [0].aDesc = a_1item_name;
208-
attributes [1].aDesc = a_2item_color;
209-
attributes [2].aDesc = a_3number_of_sides;
210-
}
211-
#endif
212-
213188
SdaiShape::SdaiShape( SCLP23( Application_instance ) *se, int * addAttrs ) {
214189
/* Set this to point to the head entity. */
215190
HeadEntity( se );
@@ -363,15 +338,6 @@ create_SdaiRectangle( os_database * db ) {
363338
}
364339
#endif
365340

366-
#ifdef __O3DB__
367-
void
368-
SdaiRectangle::oodb_reInit() {
369-
eDesc = example_schemae_rectangle;
370-
attributes [3].aDesc = a_4height;
371-
attributes [4].aDesc = a_5width;
372-
}
373-
#endif
374-
375341
SdaiRectangle::SdaiRectangle( SCLP23( Application_instance ) *se, int * addAttrs ) : SdaiShape( se, ( addAttrs ? &addAttrs[1] : 0 ) ) {
376342
/* Set this to point to the head entity. */
377343
HeadEntity( se );
@@ -450,13 +416,6 @@ SdaiSquare::SdaiSquare( SdaiSquare & e ) {
450416
}
451417
SdaiSquare::~SdaiSquare() { }
452418

453-
#ifdef __O3DB__
454-
void
455-
SdaiSquare::oodb_reInit() {
456-
eDesc = example_schemae_square;
457-
}
458-
#endif
459-
460419
SdaiSquare::SdaiSquare( SCLP23( Application_instance ) *se, int * addAttrs ) : SdaiRectangle( se, ( addAttrs ? &addAttrs[1] : 0 ) ) {
461420
/* Set this to point to the head entity. */
462421
HeadEntity( se );
@@ -504,16 +463,6 @@ SdaiTriangle::SdaiTriangle( SdaiTriangle & e ) {
504463
}
505464
SdaiTriangle::~SdaiTriangle() { }
506465

507-
#ifdef __O3DB__
508-
void
509-
SdaiTriangle::oodb_reInit() {
510-
eDesc = example_schemae_triangle;
511-
attributes [3].aDesc = a_6side1_length;
512-
attributes [4].aDesc = a_7side2_length;
513-
attributes [5].aDesc = a_8side3_length;
514-
}
515-
#endif
516-
517466
SdaiTriangle::SdaiTriangle( SCLP23( Application_instance ) *se, int * addAttrs ) : SdaiShape( se, ( addAttrs ? &addAttrs[1] : 0 ) ) {
518467
/* Set this to point to the head entity. */
519468
HeadEntity( se );
@@ -620,14 +569,6 @@ SdaiCircle::SdaiCircle( SdaiCircle & e ) {
620569
}
621570
SdaiCircle::~SdaiCircle() { }
622571

623-
#ifdef __O3DB__
624-
void
625-
SdaiCircle::oodb_reInit() {
626-
eDesc = example_schemae_circle;
627-
attributes [3].aDesc = a_9radius;
628-
}
629-
#endif
630-
631572
SdaiCircle::SdaiCircle( SCLP23( Application_instance ) *se, int * addAttrs ) : SdaiShape( se, ( addAttrs ? &addAttrs[1] : 0 ) ) {
632573
/* Set this to point to the head entity. */
633574
HeadEntity( se );
@@ -691,16 +632,6 @@ SdaiLine::SdaiLine( SdaiLine & e ) {
691632
}
692633
SdaiLine::~SdaiLine() { }
693634

694-
695-
#ifdef __O3DB__
696-
void
697-
SdaiLine::oodb_reInit() {
698-
eDesc = example_schemae_line;
699-
attributes [0].aDesc = a_10end_point_one;
700-
attributes [1].aDesc = a_11end_point_two;
701-
}
702-
#endif
703-
704635
SdaiLine::SdaiLine( SCLP23( Application_instance ) *se, int * addAttrs ) {
705636
/* Set this to point to the head entity. */
706637
HeadEntity( se );
@@ -788,16 +719,6 @@ SdaiCartesian_point::SdaiCartesian_point( SdaiCartesian_point & e ) {
788719
}
789720
SdaiCartesian_point::~SdaiCartesian_point() { }
790721

791-
#ifdef __O3DB__
792-
void
793-
SdaiCartesian_point::oodb_reInit() {
794-
eDesc = example_schemae_cartesian_point;
795-
attributes [0].aDesc = a_12x;
796-
attributes [1].aDesc = a_13y;
797-
attributes [2].aDesc = a_14z;
798-
}
799-
#endif
800-
801722
SdaiCartesian_point::SdaiCartesian_point( SCLP23( Application_instance ) *se, int * addAttrs ) {
802723
/* Set this to point to the head entity. */
803724
HeadEntity( se );

‎src/clSchemas/example/SdaiEXAMPLE_SCHEMA.h‎

Lines changed: 0 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,10 @@
55
// regenerate it.
66
/* $Id$ */
77

8-
#ifdef __O3DB__
9-
#include <OpenOODB.h>
10-
#endif
11-
128
#ifndef SCHEMA_H
139
#include <schema.h>
1410
#endif
1511

16-
#ifdef PART26
17-
#include <corbaIncludes.h>
18-
// Create a corbaSchema.h file in this directory with a #include in
19-
// it for your IDL generated schema-specific .hh file.
20-
#include <corbaSchema.h>
21-
#endif
22-
2312
/* ************** TYPES */
2413

2514
////////// ENUMERATION TYPE color
@@ -110,10 +99,6 @@ class SdaiPoly_line : public SCLP23( Application_instance ) {
11099
SdaiPoly_line( SdaiPoly_line & e );
111100
~SdaiPoly_line();
112101

113-
#ifdef __O3DB__
114-
void oodb_reInit();
115-
#endif
116-
117102
int opcode() {
118103
return 0 ;
119104
}
@@ -123,17 +108,10 @@ class SdaiPoly_line : public SCLP23( Application_instance ) {
123108

124109
};
125110

126-
#ifdef __O3DB__
127-
inline SCLP23( Application_instance_ptr )
128-
create_SdaiPoly_line() {
129-
return ( SCLP23( Application_instance_ptr ) ) new SdaiPoly_line ;
130-
}
131-
#else
132111
inline SdaiPoly_line *
133112
create_SdaiPoly_line() {
134113
return new SdaiPoly_line ;
135114
}
136-
#endif
137115

138116
///////// END_ENTITY poly_line
139117

@@ -157,10 +135,6 @@ class SdaiShape : public SCLP23( Application_instance ) {
157135
SdaiShape( SdaiShape & e );
158136
~SdaiShape();
159137

160-
#ifdef __O3DB__
161-
void oodb_reInit();
162-
#endif
163-
164138
int opcode() {
165139
return 1 ;
166140
}
@@ -176,17 +150,10 @@ class SdaiShape : public SCLP23( Application_instance ) {
176150

177151
};
178152

179-
#ifdef __O3DB__
180-
inline SCLP23( Application_instance_ptr )
181-
create_SdaiShape() {
182-
return ( SCLP23( Application_instance_ptr ) ) new SdaiShape ;
183-
}
184-
#else
185153
inline SdaiShape *
186154
create_SdaiShape() {
187155
return new SdaiShape ;
188156
}
189-
#endif
190157

191158
///////// END_ENTITY shape
192159

@@ -208,10 +175,6 @@ class SdaiRectangle : public SdaiShape {
208175
SdaiRectangle( SdaiRectangle & e );
209176
~SdaiRectangle();
210177

211-
#ifdef __O3DB__
212-
void oodb_reInit();
213-
#endif
214-
215178
int opcode() {
216179
return 2 ;
217180
}
@@ -226,17 +189,10 @@ class SdaiRectangle : public SdaiShape {
226189

227190
};
228191

229-
#ifdef __O3DB__
230-
inline SCLP23( Application_instance_ptr )
231-
create_SdaiRectangle() {
232-
return ( SCLP23( Application_instance_ptr ) ) new SdaiRectangle ;
233-
}
234-
#else
235192
inline SdaiRectangle *
236193
create_SdaiRectangle() {
237194
return new SdaiRectangle ;
238195
}
239-
#endif
240196

241197
///////// END_ENTITY rectangle
242198

@@ -254,10 +210,6 @@ class SdaiSquare : public SdaiRectangle {
254210
SdaiSquare( SdaiSquare & e );
255211
~SdaiSquare();
256212

257-
#ifdef __O3DB__
258-
void oodb_reInit();
259-
#endif
260-
261213
int opcode() {
262214
return 3 ;
263215
}
@@ -266,17 +218,10 @@ class SdaiSquare : public SdaiRectangle {
266218

267219
};
268220

269-
#ifdef __O3DB__
270-
inline SCLP23( Application_instance_ptr )
271-
create_SdaiSquare() {
272-
return ( SCLP23( Application_instance_ptr ) ) new SdaiSquare ;
273-
}
274-
#else
275221
inline SdaiSquare *
276222
create_SdaiSquare() {
277223
return new SdaiSquare ;
278224
}
279-
#endif
280225

281226
///////// END_ENTITY square
282227

@@ -300,10 +245,6 @@ class SdaiTriangle : public SdaiShape {
300245
SdaiTriangle( SdaiTriangle & e );
301246
~SdaiTriangle();
302247

303-
#ifdef __O3DB__
304-
void oodb_reInit();
305-
#endif
306-
307248
int opcode() {
308249
return 4 ;
309250
}
@@ -321,17 +262,10 @@ class SdaiTriangle : public SdaiShape {
321262

322263
};
323264

324-
#ifdef __O3DB__
325-
inline SCLP23( Application_instance_ptr )
326-
create_SdaiTriangle() {
327-
return ( SCLP23( Application_instance_ptr ) ) new SdaiTriangle ;
328-
}
329-
#else
330265
inline SdaiTriangle *
331266
create_SdaiTriangle() {
332267
return new SdaiTriangle ;
333268
}
334-
#endif
335269

336270
///////// END_ENTITY triangle
337271

@@ -351,10 +285,6 @@ class SdaiCircle : public SdaiShape {
351285
SdaiCircle( SdaiCircle & e );
352286
~SdaiCircle();
353287

354-
#ifdef __O3DB__
355-
void oodb_reInit();
356-
#endif
357-
358288
int opcode() {
359289
return 5 ;
360290
}
@@ -366,17 +296,10 @@ class SdaiCircle : public SdaiShape {
366296

367297
};
368298

369-
#ifdef __O3DB__
370-
inline SCLP23( Application_instance_ptr )
371-
create_SdaiCircle() {
372-
return ( SCLP23( Application_instance_ptr ) ) new SdaiCircle ;
373-
}
374-
#else
375299
inline SdaiCircle *
376300
create_SdaiCircle() {
377301
return new SdaiCircle ;
378302
}
379-
#endif
380303

381304
///////// END_ENTITY circle
382305

@@ -398,10 +321,6 @@ class SdaiLine : public SCLP23( Application_instance ) {
398321
SdaiLine( SdaiLine & e );
399322
~SdaiLine();
400323

401-
#ifdef __O3DB__
402-
void oodb_reInit();
403-
#endif
404-
405324
int opcode() {
406325
return 6 ;
407326
}
@@ -414,17 +333,10 @@ class SdaiLine : public SCLP23( Application_instance ) {
414333

415334
};
416335

417-
#ifdef __O3DB__
418-
inline SCLP23( Application_instance_ptr )
419-
create_SdaiLine() {
420-
return ( SCLP23( Application_instance_ptr ) ) new SdaiLine ;
421-
}
422-
#else
423336
inline SdaiLine *
424337
create_SdaiLine() {
425338
return new SdaiLine ;
426339
}
427-
#endif
428340

429341
///////// END_ENTITY line
430342

@@ -448,10 +360,6 @@ class SdaiCartesian_point : public SCLP23( Application_instance ) {
448360
SdaiCartesian_point( SdaiCartesian_point & e );
449361
~SdaiCartesian_point();
450362

451-
#ifdef __O3DB__
452-
void oodb_reInit();
453-
#endif
454-
455363
int opcode() {
456364
return 7 ;
457365
}
@@ -467,17 +375,10 @@ class SdaiCartesian_point : public SCLP23( Application_instance ) {
467375

468376
};
469377

470-
#ifdef __O3DB__
471-
inline SCLP23( Application_instance_ptr )
472-
create_SdaiCartesian_point() {
473-
return ( SCLP23( Application_instance_ptr ) ) new SdaiCartesian_point ;
474-
}
475-
#else
476378
inline SdaiCartesian_point *
477379
create_SdaiCartesian_point() {
478380
return new SdaiCartesian_point ;
479381
}
480-
#endif
481382

482383
///////// END_ENTITY cartesian_point
483384

0 commit comments

Comments
 (0)