summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2011-03-29 12:15:00 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2011-03-29 12:15:00 +0000
commite50cff301afea3af798b4999bd5c5a01beba389d (patch)
treecd673b0f6fa170cd869b081e0853c499febb8988
parent6a811d9d51c22efd655668d70d7587a1a1d4c166 (diff)
downloadATCD-e50cff301afea3af798b4999bd5c5a01beba389d.tar.gz
Tue Mar 29 12:14:02 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp: * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: * connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp: * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: * tools/IDL3_to_IDL2/basic_visitor.h: * tools/IDL3_to_IDL2/be_global.h: * tools/IDL3_to_IDL2/be_helper.h: * tools/IDL3_to_IDL2/identifier_helper.h: * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h: * tools/IDL3_to_IDL2/idl3p_checking_visitor.h: * tools/IDL3_to_XMI/be_global.h: * tools/IDL3_to_XMI/be_helper.h: * tools/IDL3_to_XMI/identifier_helper.h: Doxygen changes
-rw-r--r--CIAO/ChangeLog17
-rwxr-xr-xCIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp4
-rw-r--r--CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp2
-rw-r--r--CIAO/tools/IDL3_to_IDL2/basic_visitor.h10
-rw-r--r--CIAO/tools/IDL3_to_IDL2/be_global.h9
-rw-r--r--CIAO/tools/IDL3_to_IDL2/be_helper.h26
-rw-r--r--CIAO/tools/IDL3_to_IDL2/identifier_helper.h27
-rw-r--r--CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h14
-rw-r--r--CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.h12
-rw-r--r--CIAO/tools/IDL3_to_XMI/be_global.h9
-rw-r--r--CIAO/tools/IDL3_to_XMI/be_helper.h26
-rw-r--r--CIAO/tools/IDL3_to_XMI/identifier_helper.h17
14 files changed, 81 insertions, 96 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index c421b336eed..f0156df7f59 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,20 @@
+Tue Mar 29 12:14:02 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp:
+ * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp:
+ * connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp:
+ * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp:
+ * tools/IDL3_to_IDL2/basic_visitor.h:
+ * tools/IDL3_to_IDL2/be_global.h:
+ * tools/IDL3_to_IDL2/be_helper.h:
+ * tools/IDL3_to_IDL2/identifier_helper.h:
+ * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h:
+ * tools/IDL3_to_IDL2/idl3p_checking_visitor.h:
+ * tools/IDL3_to_XMI/be_global.h:
+ * tools/IDL3_to_XMI/be_helper.h:
+ * tools/IDL3_to_XMI/identifier_helper.h:
+ Doxygen changes
+
Tue Mar 29 09:34:03 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp:
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp
index 9aa1a847026..e70bed60a76 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp
@@ -15,7 +15,7 @@ read (TypedDataReader::_ptr_type shapes_dr)
{
while (samples_received < 1000)
{
- //start to read
+ // Start to read
ShapeTypeSeq data;
::DDS::SampleInfoSeq info;
::DDS::ReturnCode_t retcode = shapes_dr->take (
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
index 9ae38813ffb..fb7a1cf2498 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
@@ -204,7 +204,7 @@ namespace CIAO_Getter_Test_Sender_Impl
void
Sender_exec_i::start (void)
{
- //start can be called more than once...
+ // Start can be called more than once...
if (!this->done_ && this->ccm_activated_)
{
this->done_ = true;
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp
index 3adda7b9000..d265ce3e83d 100644
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp
@@ -396,7 +396,7 @@ namespace CIAO_Proxy_RW_Test_Receiver_Impl
if (!::CORBA::is_nil (idl_reader.in ()))
{
- //start to read
+ // Start to read
ProxyReadWriteTestSeq data;
::DDS::SampleInfoSeq info;
@@ -427,7 +427,7 @@ namespace CIAO_Proxy_RW_Test_Receiver_Impl
if (!::CORBA::is_nil (idl_reader.in ()))
{
- //start to read
+ // Start to read
ProxyReadWriteTestSeq data;
::DDS::SampleInfoSeq info;
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp
index 0efda88b489..7661369b98a 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp
@@ -117,7 +117,7 @@ namespace CIAO_Reader_Test_Sender_Impl
ReaderStarter_var starter =
this->ciao_context_->get_connection_start_reader ();
- //start can be called more than once...
+ // Start can be called more than once...
if (!this->done_ && this->ccm_activated_)
{
this->done_ = true;
diff --git a/CIAO/tools/IDL3_to_IDL2/basic_visitor.h b/CIAO/tools/IDL3_to_IDL2/basic_visitor.h
index 15478637c22..3e86b00d161 100644
--- a/CIAO/tools/IDL3_to_IDL2/basic_visitor.h
+++ b/CIAO/tools/IDL3_to_IDL2/basic_visitor.h
@@ -29,16 +29,12 @@
class TAO_OutStream;
class UTL_ExceptList;
+/**
+ * Base class for visitors in this backend and others.
+ */
class TAO_IDL3_TO_IDL2_BE_Export basic_visitor
: public ast_visitor
{
- //
- // = TITLE
- // basic_visitor.
- //
- // = DESCRIPTION
- // Base class for visitors in this backend and others.
- //
public:
basic_visitor (void);
virtual ~basic_visitor (void);
diff --git a/CIAO/tools/IDL3_to_IDL2/be_global.h b/CIAO/tools/IDL3_to_IDL2/be_global.h
index 6efef349897..fd281bca9a5 100644
--- a/CIAO/tools/IDL3_to_IDL2/be_global.h
+++ b/CIAO/tools/IDL3_to_IDL2/be_global.h
@@ -30,15 +30,12 @@ class TAO_OutStream;
// Defines a class containing all back end global data.
+/**
+ * Storage of global data specific to the compiler back end
+ */
class TAO_IDL3_TO_IDL2_BE_Export BE_GlobalData
{
public:
- // = TITLE
- // BE_GlobalData
- //
- // = DESCRIPTION
- // Storage of global data specific to the compiler back end
- //
/// Constructor.
BE_GlobalData (void);
diff --git a/CIAO/tools/IDL3_to_IDL2/be_helper.h b/CIAO/tools/IDL3_to_IDL2/be_helper.h
index 1f85bf6cc89..984ddaef9b4 100644
--- a/CIAO/tools/IDL3_to_IDL2/be_helper.h
+++ b/CIAO/tools/IDL3_to_IDL2/be_helper.h
@@ -34,29 +34,27 @@ public:
TAO_NL (void);
};
+/**
+ * Operates like a manipulator, increasing the indentation level.
+ *
+ * Increase the indentation level, if the "do_now" parameter is
+ * not zero then the <indent> method is called on the stream.
+ */
struct TAO_IDL3_TO_IDL2_BE_Export TAO_INDENT
{
- // = TITLE
- // Operates like a manipulator, increasing the indentation level.
- //
- // = DESCRIPTION
- // Increase the indentation level, if the "do_now" parameter is
- // not zero then the <indent> method is called on the stream.
- //
TAO_INDENT (int do_now = 0);
const int do_now_;
};
+/**
+ * Operates like a manipulator, decreasing the indentation level.
+ *
+ * Decrease the indentation level, if the "do_now" parameter is
+ * not zero then the <indent> method is called on the stream.
+ */
struct TAO_IDL3_TO_IDL2_BE_Export TAO_UNINDENT
{
- // = TITLE
- // Operates like a manipulator, decreasing the indentation level.
- //
- // = DESCRIPTION
- // Decrease the indentation level, if the "do_now" parameter is
- // not zero then the <indent> method is called on the stream.
- //
TAO_UNINDENT (int do_now = 0);
const int do_now_;
diff --git a/CIAO/tools/IDL3_to_IDL2/identifier_helper.h b/CIAO/tools/IDL3_to_IDL2/identifier_helper.h
index 61b2689e3a9..57bcb55c3b8 100644
--- a/CIAO/tools/IDL3_to_IDL2/identifier_helper.h
+++ b/CIAO/tools/IDL3_to_IDL2/identifier_helper.h
@@ -28,33 +28,28 @@
class Identifier;
+/**
+ * 1) keeps escape (leading underscore character in generated identifier in IDL
+ * 2) removes the '_' escape character when the identifier is part of another
+ * identifier such as in provides_XXX
+ * 3) removes any '_cxx_' in generated IDL
+ */
struct TAO_IDL3_TO_IDL2_BE_Export IdentifierHelper
{
- //
- // = TITLE
- // IdentifierHelper.
- //
- // = DESCRIPTION
- // 1) keeps escape (leading underscore character in generated
- // identifier in IDL
- // 2) removes the '_' escape character when the identifier is
- // part of another identifier such as in provides_XXX
- // 3) removes any '_cxx_' in generated IDL
-
static Identifier *
original_local_name (Identifier * local_name);
- // Removes '_cxx_ from segments of a scoped name, and optionally
- // de-escape the last segment, if it's to be appended to.
+ /// Removes '_cxx_ from segments of a scoped name, and optionally
+ /// de-escape the last segment, if it's to be appended to.
static ACE_CString
orig_sn (UTL_ScopedName * scoped_name, bool appended_to = false);
- // Detects case-insensitive match with IDL keyword.
+ /// Detects case-insensitive match with IDL keyword.
static bool
is_idl_keyword (Identifier * local_name);
- // Preserves the 'escape' (leading underscore) in a
- // generated identifier if necessary.
+ /// Preserves the 'escape' (leading underscore) in a
+ /// generated identifier if necessary.
static ACE_CString
try_escape (Identifier * local_name);
};
diff --git a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h
index 44db66adfd1..3db944baec6 100644
--- a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h
+++ b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h
@@ -26,18 +26,14 @@
#include "TAO_IDL3_TO_IDL2_BE_Export.h"
+/**
+ * IDL3 to IDL2 conversion visitor. The methods are
+ * not pure virtual to facilitate the implementation of some
+ * derived visitors that override only a few.
+ */
class TAO_IDL3_TO_IDL2_BE_Export idl3_to_idl2_visitor
: public basic_visitor
{
- //
- // = TITLE
- // idl3_to_idl2_visitor.
- //
- // = DESCRIPTION
- // IDL3 to IDL2 conversion visitor. The methods are
- // not pure virtual to facilitate the implementation of some
- // derived visitors that override only a few.
- //
public:
idl3_to_idl2_visitor (void);
virtual ~idl3_to_idl2_visitor (void);
diff --git a/CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.h b/CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.h
index 371c90192d6..ada1280f1ad 100644
--- a/CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.h
+++ b/CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.h
@@ -27,17 +27,13 @@
#include "TAO_IDL3_TO_IDL2_BE_Export.h"
+/**
+ * Checks for modules empty of anything except template
+ * module and porttype declarations.
+ */
class TAO_IDL3_TO_IDL2_BE_Export idl3p_checking_visitor
: public basic_visitor
{
- //
- // = TITLE
- // idl3p_checking_visitor
- //
- // = DESCRIPTION
- // Checks for modules empty of anything except template
- // module and porttype declarations.
- //
public:
idl3p_checking_visitor (void);
virtual ~idl3p_checking_visitor (void);
diff --git a/CIAO/tools/IDL3_to_XMI/be_global.h b/CIAO/tools/IDL3_to_XMI/be_global.h
index c5d133b5c4b..f7c4d15e441 100644
--- a/CIAO/tools/IDL3_to_XMI/be_global.h
+++ b/CIAO/tools/IDL3_to_XMI/be_global.h
@@ -28,15 +28,12 @@
// Defines a class containing all back end global data.
+/**
+ * Storage of global data specific to the compiler back end
+ */
class CIAO_IDL3_TO_XMI_Export BE_GlobalData
{
public:
- // = TITLE
- // BE_GlobalData
- //
- // = DESCRIPTION
- // Storage of global data specific to the compiler back end
- //
/// Constructor.
BE_GlobalData (void);
diff --git a/CIAO/tools/IDL3_to_XMI/be_helper.h b/CIAO/tools/IDL3_to_XMI/be_helper.h
index d8bbb3b1766..657dbde3ffc 100644
--- a/CIAO/tools/IDL3_to_XMI/be_helper.h
+++ b/CIAO/tools/IDL3_to_XMI/be_helper.h
@@ -27,29 +27,27 @@ public:
TAO_NL (void);
};
+/**
+ * Operates like a manipulator, increasing the indentation level.
+ *
+ * Increase the indentation level, if the "do_now" parameter is
+ * not zero then the <indent> method is called on the stream.
+ */
struct TAO_INDENT
{
- // = TITLE
- // Operates like a manipulator, increasing the indentation level.
- //
- // = DESCRIPTION
- // Increase the indentation level, if the "do_now" parameter is
- // not zero then the <indent> method is called on the stream.
- //
TAO_INDENT (int do_now = 0);
const int do_now_;
};
+/**
+ * Operates like a manipulator, decreasing the indentation level.
+ *
+ * Decrease the indentation level, if the "do_now" parameter is
+ * not zero then the <indent> method is called on the stream.
+ */
struct TAO_UNINDENT
{
- // = TITLE
- // Operates like a manipulator, decreasing the indentation level.
- //
- // = DESCRIPTION
- // Decrease the indentation level, if the "do_now" parameter is
- // not zero then the <indent> method is called on the stream.
- //
TAO_UNINDENT (int do_now = 0);
const int do_now_;
diff --git a/CIAO/tools/IDL3_to_XMI/identifier_helper.h b/CIAO/tools/IDL3_to_XMI/identifier_helper.h
index 76eec29e26b..a305741a7c8 100644
--- a/CIAO/tools/IDL3_to_XMI/identifier_helper.h
+++ b/CIAO/tools/IDL3_to_XMI/identifier_helper.h
@@ -27,19 +27,14 @@
class Identifier;
+/**
+ * 1) keeps escape (leading underscore character in generated identifier in IDL
+ * 2) removes the '_' escape character when the identifier is
+ * part of another identifier such as in provides_XXX
+ * 3) removes any '_cxx_' in generated IDL
+ */
struct IdentifierHelper
{
- //
- // = TITLE
- // IdentifierHelper.
- //
- // = DESCRIPTION
- // 1) keeps escape (leading underscore character in generated
- // identifier in IDL
- // 2) removes the '_' escape character when the identifier is
- // part of another identifier such as in provides_XXX
- // 3) removes any '_cxx_' in generated IDL
-
static Identifier *
original_local_name (Identifier * local_name);