ChangeLogTag:Mon May 27 15:59:17 2002 Nanbor Wang <nanbor@cs.wustl.edu>

10 files changed, 96 insertions, 9 deletions

diff --git a/ACEXML/ACEXML.dsw b/ACEXML/ACEXML.dsw
index 42938933a20..096b5e0916d 100644
--- a/ACEXML/ACEXML.dsw
+++ b/ACEXML/ACEXML.dsw
@@ -45,6 +45,18 @@ Package=<4>
 

 ###############################################################################

 

+Project: "XML_Svc_Conf_Parser"=.\apps\svcconf\XML_Svc_Conf_Parser.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

 Global:

 

 Package=<5>

diff --git a/ACEXML/common/XML_Codecs.cpp b/ACEXML/common/XML_Codecs.cpp
index 7bd66536e45..cf3b27af97d 100644
--- a/ACEXML/common/XML_Codecs.cpp
+++ b/ACEXML/common/XML_Codecs.cpp
@@ -40,8 +40,8 @@ ACEXML_Base64::encode (const ACEXML_Char* input,
                   ACEXML_Char[encode_len+1],
                   0);
 
-  for (size_t i = 0; i < encode_len; ++i)
-    result[i] = (ACEXML_Char)encodedBuf[i];
+  for (size_t j = 0; j < encode_len; ++j)
+    result[j] = (ACEXML_Char)encodedBuf[j];
 
   result[encode_len] = 0;
 
@@ -87,8 +87,8 @@ ACEXML_Base64::decode (const ACEXML_Char* input,
                   ACEXML_Char[decode_len+1],
                   0);
 
-  for (size_t i = 0; i < decode_len; ++i)
-    result[i] = (ACEXML_Char)decodedBuf[i];
+  for (size_t j = 0; j < decode_len; ++j)
+    result[j] = (ACEXML_Char)decodedBuf[j];
 
   result[decode_len] = 0;
 
diff --git a/ACEXML/common/XML_Codecs.h b/ACEXML/common/XML_Codecs.h
index 84d45cc1e27..ee65c8d915a 100644
--- a/ACEXML/common/XML_Codecs.h
+++ b/ACEXML/common/XML_Codecs.h
@@ -33,7 +33,7 @@
  * canonical form before encoding.
  *
  */
-class ACE_Export ACEXML_Base64 : public ACE_Base64
+class ACEXML_Export ACEXML_Base64 : public ACE_Base64
 {
 public:
 
diff --git a/ACEXML/common/XML_Common.dsp b/ACEXML/common/XML_Common.dsp
index 9c1a34fe149..9ce2d7ab668 100644
--- a/ACEXML/common/XML_Common.dsp
+++ b/ACEXML/common/XML_Common.dsp
@@ -156,6 +156,10 @@ SOURCE=.\Validator.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\XML_Codecs.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\XMLFilterImpl.cpp

 # End Source File

 # End Group

@@ -256,6 +260,10 @@ SOURCE=.\Validator.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\XML_Codecs.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\XML_Types.h

 # End Source File

 # Begin Source File

diff --git a/ChangeLog b/ChangeLog
index 6494e132209..9dea8e31ae8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Mon May 27 15:59:17 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ACEXML/common/XML_Codecs.h:
+	* ACEXML/common/XML_Codecs.cpp: Fixed VC warnings.
+
+	* ace/ace_dll.dsp:
+	* ace/ace_lib.dsp: Added Codecs.*.
+
+	* tests/tests.dsw:
+	* tests/Codecs_Test.dsp: Added a new test.
+
+	* ACEXML/common/XML_Common.dsp:  Added XML_Codecs.*.
+
 Mon May 27 15:47:44 2002  Steve Huston  <shuston@riverace.com>
 
         * ace/OS.h: Add new service-related macro, ACE_Local_Service_Export.
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 6494e132209..9dea8e31ae8 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,16 @@
+Mon May 27 15:59:17 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ACEXML/common/XML_Codecs.h:
+	* ACEXML/common/XML_Codecs.cpp: Fixed VC warnings.
+
+	* ace/ace_dll.dsp:
+	* ace/ace_lib.dsp: Added Codecs.*.
+
+	* tests/tests.dsw:
+	* tests/Codecs_Test.dsp: Added a new test.
+
+	* ACEXML/common/XML_Common.dsp:  Added XML_Codecs.*.
+
 Mon May 27 15:47:44 2002  Steve Huston  <shuston@riverace.com>
 
         * ace/OS.h: Add new service-related macro, ACE_Local_Service_Export.
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 6494e132209..9dea8e31ae8 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,16 @@
+Mon May 27 15:59:17 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ACEXML/common/XML_Codecs.h:
+	* ACEXML/common/XML_Codecs.cpp: Fixed VC warnings.
+
+	* ace/ace_dll.dsp:
+	* ace/ace_lib.dsp: Added Codecs.*.
+
+	* tests/tests.dsw:
+	* tests/Codecs_Test.dsp: Added a new test.
+
+	* ACEXML/common/XML_Common.dsp:  Added XML_Codecs.*.
+
 Mon May 27 15:47:44 2002  Steve Huston  <shuston@riverace.com>
 
         * ace/OS.h: Add new service-related macro, ACE_Local_Service_Export.
diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp
index adedbd44103..437b94280b0 100644
--- a/ace/ace_dll.dsp
+++ b/ace/ace_dll.dsp
@@ -258,6 +258,10 @@ SOURCE=.\CDR_Stream.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Codecs.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Configuration.cpp

 # End Source File

 # Begin Source File

@@ -1238,6 +1242,10 @@ SOURCE=.\Cleanup_Strategies_T.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Codecs.h

+# End Source File

+# Begin Source File

+

 SOURCE=".\config-all.h"

 # End Source File

 # Begin Source File

diff --git a/ace/ace_lib.dsp b/ace/ace_lib.dsp
index c66ee8eb13e..d9ec28e7e60 100644
--- a/ace/ace_lib.dsp
+++ b/ace/ace_lib.dsp
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Output_Dir ""

 # PROP Intermediate_Dir ".\LIB\Release"

 # PROP Target_Dir ""

-MTL=midl.exe

 LINK32=link.exe -lib

+MTL=midl.exe

 # ADD BASE CPP /nologo /MD /W3 /GX /O1 /I "../" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /MT /W3 /GX /O1 /I "../" /I "../PACE" /D ACE_OS_HAS_DLL=0 /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

@@ -69,8 +69,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir ""

 # PROP Intermediate_Dir ".\LIB\Debug"

 # PROP Target_Dir ""

-MTL=midl.exe

 LINK32=link.exe -lib

+MTL=midl.exe

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /FD /c

 # SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /Gy /I "../" /I "../PACE" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c

@@ -96,8 +96,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir ""

 # PROP Intermediate_Dir ".\LIB\Release"

 # PROP Target_Dir ""

-MTL=midl.exe

 LINK32=link.exe -lib

+MTL=midl.exe

 # ADD BASE CPP /nologo /G5 /MT /W3 /GX /O1 /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c

 # ADD CPP /nologo /MD /W3 /GX /Zi /O1 /I "../" /I "../PACE" /D "_WINDOWS" /D "NDEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c

 # SUBTRACT CPP /YX

@@ -122,8 +122,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir ""

 # PROP Intermediate_Dir ".\LIB\Debug"

 # PROP Target_Dir ""

-MTL=midl.exe

 LINK32=link.exe -lib

+MTL=midl.exe

 # ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /I "../PACE" /D "_WINDOWS" /D "_DEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c

 # SUBTRACT CPP /YX

@@ -245,6 +245,10 @@ SOURCE=.\CDR_Stream.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Codecs.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Configuration.cpp

 # End Source File

 # Begin Source File

@@ -1229,6 +1233,10 @@ SOURCE=.\Cleanup_Strategies_T.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Codecs.h

+# End Source File

+# Begin Source File

+

 SOURCE=".\config-all.h"

 # End Source File

 # Begin Source File

diff --git a/tests/tests.dsw b/tests/tests.dsw
index 5b4dad2627e..40b03a64991 100644
--- a/tests/tests.dsw
+++ b/tests/tests.dsw
@@ -207,6 +207,18 @@ Package=<4>
 

 ###############################################################################

 

+Project: "Codecs_Test"=.\Codecs_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

 Project: "Collection_Test"=.\Collection_Test.dsp - Package Owner=<4>

 

 Package=<5>