summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-02-07 03:50:33 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-02-07 03:50:33 +0000
commit4151c103f452b196afbc93ec9ed80fb1ed56920a (patch)
tree2ed87d8a8f55dc5d056e45b20a18553db97cb5b4
parentb9b5234a66cad309da7c90c59342766a52291283 (diff)
downloadATCD-4151c103f452b196afbc93ec9ed80fb1ed56920a.tar.gz
*** empty log message ***
-rw-r--r--ace/CDR_Stream.cpp4
-rw-r--r--ace/CDR_Stream.h2
-rw-r--r--ace/Makefile2
-rw-r--r--ace/ace_dll.dsp6
4 files changed, 7 insertions, 7 deletions
diff --git a/ace/CDR_Stream.cpp b/ace/CDR_Stream.cpp
index e961094fac8..5c2f50c1df5 100644
--- a/ace/CDR_Stream.cpp
+++ b/ace/CDR_Stream.cpp
@@ -33,10 +33,10 @@
// by external critical sections.
#define ACE_BUILD_DLL
-#include "ace/CDR.h"
+#include "ace/CDR_Stream.h"
#if !defined (__ACE_INLINE__)
-# include "ace/CDR.i"
+# include "ace/CDR_Stream.i"
#endif /* ! __ACE_INLINE__ */
int
diff --git a/ace/CDR_Stream.h b/ace/CDR_Stream.h
index 9796ac609ea..7aef7b64759 100644
--- a/ace/CDR_Stream.h
+++ b/ace/CDR_Stream.h
@@ -741,7 +741,7 @@ protected:
};
#if defined(__ACE_INLINE__)
-# include "ace/CDR.i"
+# include "ace/CDR_Stream.i"
#else
// CDR output operators for primitive types
diff --git a/ace/Makefile b/ace/Makefile
index 93640e7529b..ab971ec3eca 100644
--- a/ace/Makefile
+++ b/ace/Makefile
@@ -18,7 +18,7 @@ FILES = Log_Msg \
Asynch_IO \
Basic_Types \
Containers \
- CDR \
+ CDR_Stream \
CORBA_Handler \
CORBA_Ref \
DEV \
diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp
index 80b1e5d44cf..d85f7a38f0b 100644
--- a/ace/ace_dll.dsp
+++ b/ace/ace_dll.dsp
@@ -1806,7 +1806,7 @@ DEP_CPP_BASIC=\
# End Source File
# Begin Source File
-SOURCE=.\CDR.cpp
+SOURCE=.\CDR_Stream.cpp
!IF "$(CFG)" == "ACE dynamic library - Win32 Debug"
@@ -25570,7 +25570,7 @@ SOURCE=.\Basic_Types.h
# End Source File
# Begin Source File
-SOURCE=.\CDR.h
+SOURCE=.\CDR_Stream.h
# End Source File
# Begin Source File
@@ -26378,7 +26378,7 @@ SOURCE=.\Basic_Types.i
# End Source File
# Begin Source File
-SOURCE=.\CDR.i
+SOURCE=.\CDR_Stream.i
# End Source File
# Begin Source File