summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2004-09-03 08:04:22 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2004-09-03 08:04:22 +0000
commit860b480236cbdc1ff1a55b02b6d11f7d1c3073be (patch)
tree42316b74b688ac4f15a3a84368c104e2a3735f0a
parentfc5ca7b26819c1e2231409b648221b0b2fa78ca8 (diff)
downloadATCD-860b480236cbdc1ff1a55b02b6d11f7d1c3073be.tar.gz
ChangeLogTag: Fri Sep 3 08:04:12 UTC 2004 Johnny WIllemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/tao/Exception.h2
-rw-r--r--TAO/tao/Sequence.cpp2
-rw-r--r--TAO/tao/SystemException.cpp1
-rw-r--r--TAO/tao/UserException.cpp3
4 files changed, 7 insertions, 1 deletions
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index f0db1280c40..9a6cff3dd5c 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -275,6 +275,8 @@ private:
*
* @brief This class is only used internally in TAO as an exception
* that never gets thrown. Never use this class anywhere.
+ *
+ * @internal
*/
class TAO_Export TAO_DONT_CATCH
{
diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp
index 9410f8000dc..dc753c2fb34 100644
--- a/TAO/tao/Sequence.cpp
+++ b/TAO/tao/Sequence.cpp
@@ -6,7 +6,7 @@
#include "tao/Sequence.i"
#endif /* __ACE_INLINE__ */
-#include "Exception.h"
+#include "SystemException.h"
#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
# include "ace/Message_Block.h"
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index 50c7857e86e..fcef1f108db 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -14,6 +14,7 @@
#include "ace/Malloc.h"
#include "ace/SString.h"
#include "ace/OS_NS_string.h"
+#include "ace/OS_NS_stdio.h"
#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
diff --git a/TAO/tao/UserException.cpp b/TAO/tao/UserException.cpp
index 8b70d678d0b..579032232a9 100644
--- a/TAO/tao/UserException.cpp
+++ b/TAO/tao/UserException.cpp
@@ -4,6 +4,9 @@
#include "ace/SString.h"
+#if !defined (__ACE_INLINE__)
+# include "tao/UserException.inl"
+#endif /* __ACE_INLINE__ */
ACE_RCSID (tao,
UserException,