cvs commit: xml-xalan/c/src/XalanExe XalanExe.cpp

[dbertoni]

dbertoni    2002/11/25 14:13:16

  Modified:    c/src/XalanExe XalanExe.cpp
  Log:
  Updates for new C++ namespace support.
  
  Revision  Changes    Path
  1.16      +15 -9     xml-xalan/c/src/XalanExe/XalanExe.cpp
  
  Index: XalanExe.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanExe/XalanExe.cpp,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- XalanExe.cpp      19 Nov 2002 22:27:03 -0000      1.15
  +++ XalanExe.cpp      25 Nov 2002 22:13:16 -0000      1.16
  @@ -93,12 +93,10 @@
   
   
   
  -#if !defined (XALAN_NO_NAMESPACES)
  -using std::cerr;
  -using std::cin;
  -using std::cout;
  -using std::endl;
  -#endif
  +XALAN_USING_STD(cerr)
  +XALAN_USING_STD(cin)
  +XALAN_USING_STD(cout)
  +XALAN_USING_STD(endl)
   
   #if defined(XALAN_STRICT_ANSI_HEADERS)
   using std::atoi;
  @@ -147,6 +145,10 @@
   
   
   
  +XALAN_USING_XALAN(XalanTransformer)
  +XALAN_USING_XALAN(XSLTInputSource)
  +
  +
   class Params
   {
   public:
  @@ -246,10 +248,12 @@
                const char*             m_expression;
        };
   
  -     XalanArrayAutoPtr<ParamPair>    m_params;
  +     typedef XALAN_CPP_NAMESPACE_QUALIFIER XalanArrayAutoPtr<ParamPair>      
ArrayAutoPtrType;
   
  -     const unsigned long                             m_maxParams;
  -     unsigned long                                   m_currentParam;
  +     ArrayAutoPtrType                m_params;
  +
  +     const unsigned long             m_maxParams;
  +     unsigned long                   m_currentParam;
   };
   
   
  @@ -493,6 +497,8 @@
        }
        else
        {
  +             XALAN_USING_XERCES(XMLPlatformUtils)
  +
                // Call the static initializer for Xerces...
                XMLPlatformUtils::Initialize();
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]