ChangeLogTag: Wed Jan 5 14:08:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

21 files changed, 14 insertions, 59 deletions

diff --git a/ACEXML/ChangeLog b/ACEXML/ChangeLog
index d1685d6b5a1..62a85deab55 100644
--- a/ACEXML/ChangeLog
+++ b/ACEXML/ChangeLog
@@ -1,3 +1,14 @@
+Wed Jan  5 14:08:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * common/DefaultHandler.{h,cpp,i}:
+        * common/NamespaceSupport.{h,cpp,i}:
+        * common/Transcode.{h,cpp,i}:
+        * examples/SAXPrint/Print_Handler.{cpp,i}:
+          Removed .i file and updated h/cpp file
+
+        * common/Makefile.am:
+          Updated
+
 Tue Aug 17 19:07:11 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
 	* common/NamespaceSupport.cpp:
diff --git a/ACEXML/examples/SAXPrint/Makefile.am b/ACEXML/examples/SAXPrint/Makefile.am
index 4ba83af5eb5..619943c498b 100644
--- a/ACEXML/examples/SAXPrint/Makefile.am
+++ b/ACEXML/examples/SAXPrint/Makefile.am
@@ -12,7 +12,7 @@ ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
-## Makefile.SAXPrint.am 
+## Makefile.SAXPrint.am
 
 if BUILD_ACEXML
 noinst_PROGRAMS += SAXPrint
@@ -28,7 +28,6 @@ SAXPrint_SOURCES = \
   main.cpp \
   Print_Handler.h \
   SAXPrint_Handler.h \
-  Print_Handler.i \
   SAXPrint_Handler.i
 
 SAXPrint_LDADD = \
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.cpp b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
index 59f3cbfaae1..7c3a3f08e52 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
@@ -2,10 +2,6 @@
 
 #include "Peer_i.h"
 
-#if !defined(__ACE_INLINE__)
-#include "Peer_i.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(FL_Callback, Peer_i, "$Id$")
 
 Peer_Handler_i::Peer_Handler_i (Peer_i *peer)
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.h b/TAO/examples/AMI/FL_Callback/Peer_i.h
index c0583be398c..b5593adc52a 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.h
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.h
@@ -128,8 +128,4 @@ private:
   // Our id
 };
 
-#if defined(__ACE_INLINE__)
-#include "Peer_i.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* PEER_I_H */
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.i b/TAO/examples/AMI/FL_Callback/Peer_i.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/examples/AMI/FL_Callback/Peer_i.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.cpp b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
index 4b1d16887bc..8232c22e756 100644
--- a/TAO/examples/AMI/FL_Callback/Progress_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
@@ -7,12 +7,8 @@
 #include <FL/Fl_Slider.h>
 #include <FL/Fl_Button.h>
 
-#if !defined(__ACE_INLINE__)
-#include "Progress_i.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (FL_Cube, 
-           test_i, 
+ACE_RCSID (FL_Cube,
+           test_i,
            "$Id$")
 
 Progress_i::Progress_i (Progress_Window *window)
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.h b/TAO/examples/AMI/FL_Callback/Progress_i.h
index e382d928147..32692219f10 100644
--- a/TAO/examples/AMI/FL_Callback/Progress_i.h
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.h
@@ -91,10 +91,6 @@ private:
   // Display the graphics...
 };
 
-#if defined(__ACE_INLINE__)
-#include "Progress_i.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* ACE_HAS_FL */
 
 #endif /* PROGRESS_I_H */
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.i b/TAO/examples/AMI/FL_Callback/Progress_i.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/examples/AMI/FL_Callback/Progress_i.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tests/FL_Cube/test_i.cpp b/TAO/tests/FL_Cube/test_i.cpp
index 6fd545c5917..5a73baab476 100644
--- a/TAO/tests/FL_Cube/test_i.cpp
+++ b/TAO/tests/FL_Cube/test_i.cpp
@@ -5,10 +5,6 @@
 #if defined(ACE_HAS_FL)
 #include <GL/gl.h>
 
-#if !defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(FL_Cube, test_i, "$Id$")
 
 Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb,
diff --git a/TAO/tests/FL_Cube/test_i.h b/TAO/tests/FL_Cube/test_i.h
index e65bdd92e94..ede24fd4ecf 100644
--- a/TAO/tests/FL_Cube/test_i.h
+++ b/TAO/tests/FL_Cube/test_i.h
@@ -79,10 +79,6 @@ private:
   // Display the graphics...
 };
 
-#if defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* ACE_HAS_FL */
 
 #endif /* TAO_FL_SERVER_TEST_I_H */
diff --git a/TAO/tests/FL_Cube/test_i.i b/TAO/tests/FL_Cube/test_i.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tests/FL_Cube/test_i.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tests/Object_Loader/Loader.cpp b/TAO/tests/Object_Loader/Loader.cpp
index 792ccb496a4..73ae41e115f 100644
--- a/TAO/tests/Object_Loader/Loader.cpp
+++ b/TAO/tests/Object_Loader/Loader.cpp
@@ -3,10 +3,6 @@
 #include "Loader.h"
 #include "Test_i.h"
 
-#if !defined(__ACE_INLINE__)
-#include "Loader.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Object_Loader, Loader, "$Id$")
 
 Loader::Loader (void)
diff --git a/TAO/tests/Object_Loader/Loader.h b/TAO/tests/Object_Loader/Loader.h
index 7451744993f..73b4c5708f4 100644
--- a/TAO/tests/Object_Loader/Loader.h
+++ b/TAO/tests/Object_Loader/Loader.h
@@ -38,10 +38,6 @@ public:
   // Create a new instance
 };
 
-#if defined(__ACE_INLINE__)
-#include "Loader.i"
-#endif /* __ACE_INLINE__ */
-
 // ACE_STATIC_SVC_DECLARE (Loader)
 ACE_FACTORY_DECLARE (OLT, Loader)
 
diff --git a/TAO/tests/Object_Loader/Loader.i b/TAO/tests/Object_Loader/Loader.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tests/Object_Loader/Loader.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tests/Object_Loader/Test_i.cpp b/TAO/tests/Object_Loader/Test_i.cpp
index af7f919ab6c..6150714b0a5 100644
--- a/TAO/tests/Object_Loader/Test_i.cpp
+++ b/TAO/tests/Object_Loader/Test_i.cpp
@@ -2,10 +2,6 @@
 
 #include "Test_i.h"
 
-#if !defined(__ACE_INLINE__)
-#include "Test_i.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Object_Loader, Test_i, "$Id$")
 
 CORBA::Long
diff --git a/TAO/tests/Object_Loader/Test_i.h b/TAO/tests/Object_Loader/Test_i.h
index 83adb188234..9d893017966 100644
--- a/TAO/tests/Object_Loader/Test_i.h
+++ b/TAO/tests/Object_Loader/Test_i.h
@@ -53,10 +53,6 @@ private:
   static CORBA::Long instance_count_;
 };
 
-#if defined(__ACE_INLINE__)
-#include "Test_i.i"
-#endif /* __ACE_INLINE__ */
-
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tests/Object_Loader/Test_i.i b/TAO/tests/Object_Loader/Test_i.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tests/Object_Loader/Test_i.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp
index 8b5bae8c705..3d97049c81c 100755
--- a/TAO/tests/QtTests/test_i.cpp
+++ b/TAO/tests/QtTests/test_i.cpp
@@ -4,10 +4,6 @@
 
 #if defined(ACE_HAS_QT)
 
-#if !defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(FL_Cube, test_i, "$Id$")
 
 LCD_Display_imp::LCD_Display_imp (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/QtTests/test_i.h b/TAO/tests/QtTests/test_i.h
index 46eeb94d323..d655bec27da 100755
--- a/TAO/tests/QtTests/test_i.h
+++ b/TAO/tests/QtTests/test_i.h
@@ -56,10 +56,6 @@ private:
   // The ORB
 };
 
-#if defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* ACE_HAS_QT */
 
 #endif /* SERVER_TEST_I_H */
diff --git a/TAO/tests/QtTests/test_i.i b/TAO/tests/QtTests/test_i.i
deleted file mode 100755
index cfa1da318d3..00000000000
--- a/TAO/tests/QtTests/test_i.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.i b/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$