diff options
Diffstat (limited to 'TAO/examples/Simulator/DOVEMIB')
| -rw-r--r-- | TAO/examples/Simulator/DOVEMIB/AnyAnalyser.h | 14 | ||||
| -rw-r--r-- | TAO/examples/Simulator/DOVEMIB/DOVEMIB.h | 8 | ||||
| -rw-r--r-- | TAO/examples/Simulator/DOVEMIB/Node.h | 61 | ||||
| -rw-r--r-- | TAO/examples/Simulator/DOVEMIB/NodeVisitor.h | 6 | ||||
| -rw-r--r-- | TAO/examples/Simulator/DOVEMIB/PrintVisitor.h | 2 | ||||
| -rw-r--r-- | TAO/examples/Simulator/DOVEMIB/any_test_i.h | 8 | ||||
| -rw-r--r-- | TAO/examples/Simulator/DOVEMIB/clnt.h | 7 |
7 files changed, 58 insertions, 48 deletions
diff --git a/TAO/examples/Simulator/DOVEMIB/AnyAnalyser.h b/TAO/examples/Simulator/DOVEMIB/AnyAnalyser.h index e5840bb289e..d3a9bb3ccf4 100644 --- a/TAO/examples/Simulator/DOVEMIB/AnyAnalyser.h +++ b/TAO/examples/Simulator/DOVEMIB/AnyAnalyser.h @@ -7,7 +7,7 @@ // AnyAnalyser.h // // = AUTHOR -// Michael Kircher +// Michael Kircher // // = DESCRIPTION // Accepts an CORBA::Any, traverses it, copies it into a tree structure @@ -19,7 +19,7 @@ #include "PrintVisitor.h" #include "tao/corba.h" -#if !defined (ANYANALYSER_H) +#ifndef ANYANALYSER_H #define ANYANALYSER_H typedef enum {PARENT_IS_STRUCT, PARENT_IS_NO_STRUCT} KIND; @@ -36,24 +36,24 @@ class AnyAnalyser { public: AnyAnalyser (const char *filename); - + ~AnyAnalyser (); // cause the PrintViewer to be deleted to close the file void close (); - + // main starting point includes analysing and printing void printAny (CORBA::TypeCode_ptr any_type, const void *any_value); void printTimeStamp (ACE_hrtime_t creation, ACE_hrtime_t ec_recv, ACE_hrtime_t ec_send); - // Print the time stamp, which means forward this + // Print the time stamp, which means forward this // call to the PrintVisitor private: - Node *analyse (CORBA::TypeCode_ptr tc_ptr, - const unsigned char *&value_ptr, + Node *analyse (CORBA::TypeCode_ptr tc_ptr, + const unsigned char *&value_ptr, RecurseInfo recurseInfo); PrintVisitor *printVisitor_ptr_; diff --git a/TAO/examples/Simulator/DOVEMIB/DOVEMIB.h b/TAO/examples/Simulator/DOVEMIB/DOVEMIB.h index 8730e2d56d0..90c6a1db6db 100644 --- a/TAO/examples/Simulator/DOVEMIB/DOVEMIB.h +++ b/TAO/examples/Simulator/DOVEMIB/DOVEMIB.h @@ -1,6 +1,6 @@ // $Id$ // ============================================================================ -// +// // = FILENAME // DOVEMIB.h // @@ -9,7 +9,7 @@ // // ============================================================================ -#if !defined (DOVE_MIB_H) +#ifndef DOVE_MIB_H #define DOVE_MIB_H //#include "ace/SString.h" @@ -29,7 +29,7 @@ public: MIB_Consumer (void); int open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, - const char *my_name); + const char *my_name); // Uses the name server to obtain a reference to the <supplier_name> // and registers with channel to receive notifications from the // supplier. Also registers to receive shutdown messages from the @@ -41,7 +41,7 @@ public: // = (not protected to allow short-circuiting) protected: virtual void push (const RtecEventComm::EventSet &events, - CORBA::Environment &); + CORBA::Environment &); // If the <events>[0] is a notification, prints out the data from // the supplier. If its a shutdown message, the consumer // disconnects from the channel. diff --git a/TAO/examples/Simulator/DOVEMIB/Node.h b/TAO/examples/Simulator/DOVEMIB/Node.h index d8029a4fa5e..90823bb26cc 100644 --- a/TAO/examples/Simulator/DOVEMIB/Node.h +++ b/TAO/examples/Simulator/DOVEMIB/Node.h @@ -7,10 +7,10 @@ // Node.h // // = AUTHOR -// Michael Kircher +// Michael Kircher // // = DESCRIPTION -// This file descibes the various node types for analysing +// This file descibes the various node types for analysing // an CORBA::Any. It is no memory allocated, that means // The values are not really contained by the nodes, but the // nodes refer to the values via pointers. @@ -19,15 +19,20 @@ #include "tao/corba.h" #include "ace/Containers.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "NodeVisitor.h" -#if !defined (NODE_H) +#ifndef NODE_H #define NODE_H // base class for nodes class Node { -public: +public: virtual ~Node () {} virtual void Accept (NodeVisitor *NodeVisitor) = 0; virtual unsigned int getRecursionLevel () = 0; @@ -41,8 +46,8 @@ protected: // Node to store information about a Struct class StructNode : public Node { public: - StructNode (const char *Name_ptr, - unsigned int recursion_level); + StructNode (const char *Name_ptr, + unsigned int recursion_level); ~StructNode (); // accpet a visitor @@ -56,15 +61,15 @@ public: // get the number of children unsigned int getChildNumber (); - + // get the name of the struct - const char *getName (); + const char *getName (); // get recursion level unsigned int getRecursionLevel (); - -private: + +private: ACE_Unbounded_Queue<Node *> *queue_ptr_; ACE_Unbounded_Queue_Iterator<Node *> *queue_iterator_ptr_; unsigned int queue_position_; @@ -76,9 +81,9 @@ private: // Node to store information about a Double class DoubleNode : public Node { public: - DoubleNode (CORBA::Double *Double_ptr, - const char *Name_ptr, - unsigned int recursion_level); + DoubleNode (CORBA::Double *Double_ptr, + const char *Name_ptr, + unsigned int recursion_level); ~DoubleNode () {} // accpet a visitor @@ -92,9 +97,9 @@ public: // get recursion level unsigned int getRecursionLevel (); - + private: - CORBA::Double *Double_ptr_; + CORBA::Double *Double_ptr_; const char *Name_ptr_; unsigned int recursion_level_; }; @@ -103,9 +108,9 @@ private: // Node to store information about a Long class LongNode : public Node { public: - LongNode (CORBA::Long *Long_ptr, - const char *Name_ptr, - unsigned int recursion_level); + LongNode (CORBA::Long *Long_ptr, + const char *Name_ptr, + unsigned int recursion_level); ~LongNode () {} // accpet a visitor @@ -121,7 +126,7 @@ public: unsigned int getRecursionLevel (); private: - CORBA::Long *Long_ptr_; + CORBA::Long *Long_ptr_; const char *Name_ptr_; unsigned int recursion_level_; }; @@ -130,11 +135,11 @@ private: // Node to store information about a ULong class ULongNode : public Node { public: - ULongNode (CORBA::ULong *Long_ptr, - const char *Name_ptr, - unsigned int recursion_level); - ~ULongNode () {} - + ULongNode (CORBA::ULong *Long_ptr, + const char *Name_ptr, + unsigned int recursion_level); + ~ULongNode () {} + // accpet a visitor void Accept (NodeVisitor *nodeVisitor); @@ -157,11 +162,11 @@ private: // Node to store information about a String class StringNode : public Node { public: - StringNode (CORBA::String_var String_var, - const char *Name_ptr, - unsigned int recursion_level); + StringNode (CORBA::String_var String_var, + const char *Name_ptr, + unsigned int recursion_level); ~StringNode () {} - + // accpet a visitor void Accept (NodeVisitor *nodeVisitor); diff --git a/TAO/examples/Simulator/DOVEMIB/NodeVisitor.h b/TAO/examples/Simulator/DOVEMIB/NodeVisitor.h index d19e065ae2c..f1a0d5d4050 100644 --- a/TAO/examples/Simulator/DOVEMIB/NodeVisitor.h +++ b/TAO/examples/Simulator/DOVEMIB/NodeVisitor.h @@ -7,14 +7,14 @@ // NodeVisitor.h // // = AUTHOR -// Michael Kircher +// Michael Kircher // // = DESCRIPTION // This file descibes the Visitor used by the any evaluator. // // ============================================================================ -#if !defined (NODE_VISITOR_H) +#ifndef NODE_VISITOR_H #define NODE_VISITOR_H class StructNode; @@ -30,7 +30,7 @@ public: virtual void visitStructNode (StructNode *structNode) = 0; virtual void visitDoubleNode (DoubleNode *doubleNode) = 0; virtual void visitLongNode (LongNode *longNode) = 0; - virtual void visitULongNode (ULongNode *uLongNode) = 0; + virtual void visitULongNode (ULongNode *uLongNode) = 0; virtual void visitStringNode (StringNode *stringNode) = 0; protected: NodeVisitor () {} diff --git a/TAO/examples/Simulator/DOVEMIB/PrintVisitor.h b/TAO/examples/Simulator/DOVEMIB/PrintVisitor.h index 6c0f16a5f3d..b2b2a6f28a0 100644 --- a/TAO/examples/Simulator/DOVEMIB/PrintVisitor.h +++ b/TAO/examples/Simulator/DOVEMIB/PrintVisitor.h @@ -18,7 +18,7 @@ #include "NodeVisitor.h" #include "Node.h" -#if !defined (PRINT_VISITOR_H) +#ifndef PRINT_VISITOR_H #define PRINT_VISITOR_H diff --git a/TAO/examples/Simulator/DOVEMIB/any_test_i.h b/TAO/examples/Simulator/DOVEMIB/any_test_i.h index eb877ef23c5..673b892fb19 100644 --- a/TAO/examples/Simulator/DOVEMIB/any_test_i.h +++ b/TAO/examples/Simulator/DOVEMIB/any_test_i.h @@ -3,17 +3,17 @@ // ============================================================================ // // = LIBRARY -// +// // = FILENAME // any_test_i.h // // = AUTHOR // Michael Kircher -// +// // ============================================================================ -#if !defined (_ANY_TEST_I_HH) -#define _ANY_TEST_I_HH +#ifndef _ANY_TEST_I_HH +#define _ANY_TEST_I_HH #include "any_testS.h" diff --git a/TAO/examples/Simulator/DOVEMIB/clnt.h b/TAO/examples/Simulator/DOVEMIB/clnt.h index 67ed5c84d57..bec38868e21 100644 --- a/TAO/examples/Simulator/DOVEMIB/clnt.h +++ b/TAO/examples/Simulator/DOVEMIB/clnt.h @@ -16,6 +16,11 @@ // ============================================================================ #include "ace/Get_Opt.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "tao/corba.h" #include "any_testC.h" #include "NavWeapC.h" @@ -42,7 +47,7 @@ private: Any_Test_ptr any_test_ptr_; // Reverse_ptr reverse_ptr_; - + int argc_; // # of arguments on the command line. |