INTEGRATION: CWS adc18 (1.7.2); FILE MERGED

2007/10/19 10:37:30 np 1.7.2.1: #i81775#

3 files changed, 14 insertions, 13 deletions

diff --git a/autodoc/source/parser/cpp/all_toks.cxx b/autodoc/source/parser/cpp/all_toks.cxx
index 6b76d1483c06..db6eaabbeeb1 100644
--- a/autodoc/source/parser/cpp/all_toks.cxx
+++ b/autodoc/source/parser/cpp/all_toks.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: all_toks.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: vg $ $Date: 2007-09-18 14:08:44 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 16:47:30 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -50,7 +50,7 @@ namespace cpp {
 void
 Token::DealOut( ::TokenDealer & o_rDealer )
 {
-    // KORR HACK (casting to derivation cpp::TokenDealer)
+    // KORR_FUTURE HACK (casting to derivation cpp::TokenDealer)
     o_rDealer.AsDistributor()->Deal_CppCode(*this);
 }
 
@@ -152,7 +152,7 @@ Tok_UnblockMacro::Text() const
 void
 Tok_UnblockMacro::DealOut( ::TokenDealer & o_rDealer )
 {
-    // KORR HACK (casting to derivation cpp::TokenDealer)
+    // KORR_FUTURE HACK (casting to derivation cpp::TokenDealer)
     o_rDealer.AsDistributor()->Deal_Cpp_UnblockMacro(*this);
 }
 
diff --git a/autodoc/source/parser/cpp/cx_c_std.cxx b/autodoc/source/parser/cpp/cx_c_std.cxx
index 43aad1a6f8c9..1cd2d198627a 100644
--- a/autodoc/source/parser/cpp/cx_c_std.cxx
+++ b/autodoc/source/parser/cpp/cx_c_std.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: cx_c_std.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: vg $ $Date: 2007-09-18 14:10:15 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 16:49:42 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -237,8 +237,8 @@ Context_CppStd::PerformStatusFunction( uintt                    i_nStatusSignal,
         default:
         {
             char cCC = io_rText.CurChar();
-            udmstri sCurChar( &cCC, 1 );
-            throw X_Parser( X_Parser::x_InvalidChar, sCurChar, udmstri::Null_(), 0 );
+            String  sCurChar( &cCC, 1 );
+            throw X_Parser( X_Parser::x_InvalidChar, sCurChar, String::Null_(), 0 );
         }
     }   // end switch (i_nStatusSignal)
 }
@@ -534,3 +534,4 @@ Context_CppStd::SetupStateMachine()
 
 
 }   // namespace cpp
+
diff --git a/autodoc/source/parser/cpp/cx_c_sub.cxx b/autodoc/source/parser/cpp/cx_c_sub.cxx
index f4f54ffae502..d90f786f91df 100644
--- a/autodoc/source/parser/cpp/cx_c_sub.cxx
+++ b/autodoc/source/parser/cpp/cx_c_sub.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: cx_c_sub.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: vg $ $Date: 2007-09-18 14:10:28 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 16:49:59 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -53,7 +53,7 @@ namespace cpp {
 void
 Context_Comment::ReadCharChain( CharacterSource &   io_rText )
 {
-    // KORR
+    // KORR_FUTURE
     //      Counting of lines must be implemented.
     if (bCurrentModeIsMultiline)
     {
@@ -63,7 +63,7 @@ Context_Comment::ReadCharChain( CharacterSource &   io_rText )
             do {
                 cNext = jumpTo( io_rText,'*',char(10) );
                 if (cNext == NULCH)
-                    throw X_Parser( X_Parser::x_UnexpectedEOF, "", udmstri::Null_(), 0 );
+                    throw X_Parser( X_Parser::x_UnexpectedEOF, "", String::Null_(), 0 );
                 else if ( cNext == char(10) )
                 {
                     jumpOverEol(io_rText);
@@ -72,7 +72,7 @@ Context_Comment::ReadCharChain( CharacterSource &   io_rText )
             }   while ( cNext != '*');
             cNext = jumpOver(io_rText,'*');
             if (cNext == NULCH)
-                throw X_Parser( X_Parser::x_UnexpectedEOF, "", udmstri::Null_(), 0 );
+                throw X_Parser( X_Parser::x_UnexpectedEOF, "", String::Null_(), 0 );
         } while (cNext != '/');
         io_rText.MoveOn();
         io_rText.CutToken();