Skip to content

Commit b5fa839

Browse files
authored
Merge pull request #1349 from jwillemsen/jwi-autoptr2
Make use of std::unique_ptr instead of auto_ptr
2 parents 40019b0 + 75f5f0a commit b5fa839

258 files changed

Lines changed: 1432 additions & 1432 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ACE/ACEXML/common/Attributes.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class ACEXML_Export ACEXML_Attributes
5757
public:
5858

5959
/// Destructor.
60-
virtual ~ACEXML_Attributes (void);
60+
virtual ~ACEXML_Attributes ();
6161

6262
/**
6363
* Look up the index of an attribute by XML 1.0 qualified name.
@@ -73,7 +73,7 @@ class ACEXML_Export ACEXML_Attributes
7373
/**
7474
* Return the number of attributes in the list.
7575
*/
76-
virtual size_t getLength (void) = 0;
76+
virtual size_t getLength () = 0;
7777

7878
/**
7979
* Look up an attribute's local name by index.

ACE/ACEXML/common/CharStream.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ class ACEXML_Export ACEXML_CharStream
3333
/**
3434
* Virtual destructor, must have.
3535
*/
36-
virtual ~ACEXML_CharStream (void) = 0;
36+
virtual ~ACEXML_CharStream () = 0;
3737

3838
/**
3939
* Returns the available ACEXML_Char in the buffer. -1
4040
* if the object is not initialized properly.
4141
*/
42-
virtual int available (void) = 0;
42+
virtual int available () = 0;
4343

4444
/**
4545
* Close this stream and release all resources used by it.
4646
*/
47-
virtual int close (void) = 0;
47+
virtual int close () = 0;
4848

4949
/**
5050
* Read the next ACEXML_Char. Return -1 if we are not able to
@@ -61,22 +61,22 @@ class ACEXML_Export ACEXML_CharStream
6161
* Peek the next ACEXML_Char in the CharStream. Return the
6262
* character if succeess, -1 if EOS is reached.
6363
*/
64-
virtual int peek (void) = 0;
64+
virtual int peek () = 0;
6565

6666
/**
6767
* Resets the pointer to the beginning of the stream.
6868
*/
69-
virtual void rewind (void) = 0;
69+
virtual void rewind () = 0;
7070

7171
/*
7272
* Get the character encoding for a byte stream or URI.
7373
*/
74-
virtual const ACEXML_Char *getEncoding (void) = 0;
74+
virtual const ACEXML_Char *getEncoding () = 0;
7575

7676
/*
7777
* Get the systemId for the underlying CharStream
7878
*/
79-
virtual const ACEXML_Char* getSystemId (void) = 0;
79+
virtual const ACEXML_Char* getSystemId () = 0;
8080

8181
};
8282

ACE/ACEXML/common/ContentHandler.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class ACEXML_Export ACEXML_ContentHandler
4343
{
4444
public:
4545

46-
virtual ~ACEXML_ContentHandler (void);
46+
virtual ~ACEXML_ContentHandler ();
4747

4848
/**
4949
* Receive notification of character data.
@@ -55,7 +55,7 @@ class ACEXML_Export ACEXML_ContentHandler
5555
/**
5656
* Receive notification of the end of a document.
5757
*/
58-
virtual void endDocument (void) = 0;
58+
virtual void endDocument () = 0;
5959

6060
/**
6161
* Receive notification of the end of an element.
@@ -95,7 +95,7 @@ class ACEXML_Export ACEXML_ContentHandler
9595
/**
9696
* Receive notification of the beginning of a document.
9797
*/
98-
virtual void startDocument (void) = 0;
98+
virtual void startDocument () = 0;
9999

100100
/**
101101
* Receive notification of the beginning of an element.

ACE/ACEXML/common/DTDHandler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class ACEXML_Export ACEXML_DTDHandler
4949
{
5050
public:
5151

52-
virtual ~ACEXML_DTDHandler (void);
52+
virtual ~ACEXML_DTDHandler ();
5353

5454
/**
5555
* Receive notification of a notation declaration event.

ACE/ACEXML/common/DefaultHandler.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ class ACEXML_Export ACEXML_DefaultHandler
5050
/**
5151
* Default constructor.
5252
*/
53-
ACEXML_DefaultHandler (void);
53+
ACEXML_DefaultHandler ();
5454

5555
/**
5656
* destructor.
5757
*/
58-
virtual ~ACEXML_DefaultHandler (void);
58+
virtual ~ACEXML_DefaultHandler ();
5959

6060
// Methods inherit from ACEXML_ContentHandler.
6161

@@ -69,7 +69,7 @@ class ACEXML_Export ACEXML_DefaultHandler
6969
/*
7070
* Receive notification of the end of a document.
7171
*/
72-
virtual void endDocument (void);
72+
virtual void endDocument ();
7373

7474
/*
7575
* Receive notification of the end of an element.
@@ -109,7 +109,7 @@ class ACEXML_Export ACEXML_DefaultHandler
109109
/*
110110
* Receive notification of the beginning of a document.
111111
*/
112-
virtual void startDocument (void);
112+
virtual void startDocument ();
113113

114114
/*
115115
* Receive notification of the beginning of an element.

ACE/ACEXML/common/EntityResolver.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class ACEXML_Export ACEXML_EntityResolver
4242
{
4343
public:
4444

45-
virtual ~ACEXML_EntityResolver (void);
45+
virtual ~ACEXML_EntityResolver ();
4646

4747
/**
4848
* Allow the application to resolve external entities.

ACE/ACEXML/common/ErrorHandler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class ACEXML_Export ACEXML_ErrorHandler
4545
{
4646
public:
4747

48-
virtual ~ACEXML_ErrorHandler (void);
48+
virtual ~ACEXML_ErrorHandler ();
4949

5050
/**
5151
* Receive notification of a recoverable error.

ACE/ACEXML/common/Exception.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,29 +36,29 @@ class ACEXML_Export ACEXML_Exception
3636
public:
3737

3838
/// Destructor.
39-
virtual ~ACEXML_Exception (void);
39+
virtual ~ACEXML_Exception ();
4040

4141
/// Throw the exception.
42-
virtual void _raise (void) = 0;
42+
virtual void _raise () = 0;
4343

4444
/// Static narrow operation.
4545
static ACEXML_Exception* _downcast (ACEXML_Exception* ex);
4646

4747
/// Return the exception type. (for safe downcast.)
48-
virtual const ACEXML_Char *id (void) const ;
48+
virtual const ACEXML_Char *id () const ;
4949

5050
/// Dynamically create a copy of this exception.
51-
virtual ACEXML_Exception *duplicate (void) const = 0;
51+
virtual ACEXML_Exception *duplicate () const = 0;
5252

5353
/// Check whether this is an exception of type specified by <name>.
5454
virtual int is_a (const ACEXML_Char *name);
5555

5656
/// Print out exception using ACE_DEBUG.
57-
virtual void print (void) const = 0;
57+
virtual void print () const = 0;
5858

5959
protected:
6060
/// Default constructor.
61-
ACEXML_Exception (void);
61+
ACEXML_Exception ();
6262

6363
/// All exceptions have names. This name is used to identify the
6464
/// type of an exception.

ACE/ACEXML/common/Exception.inl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// -*- C++ -*-
22

33
ACEXML_INLINE const ACEXML_Char *
4-
ACEXML_Exception::id (void) const
4+
ACEXML_Exception::id () const
55
{
66
return ACEXML_Exception::exception_name_;
77
}

ACE/ACEXML/common/FileCharStream.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ class ACEXML_Export ACEXML_FileCharStream : public ACEXML_CharStream
3030
{
3131
public:
3232
/// Default constructor.
33-
ACEXML_FileCharStream (void);
33+
ACEXML_FileCharStream ();
3434

3535
/// Destructor
36-
virtual ~ACEXML_FileCharStream (void);
36+
virtual ~ACEXML_FileCharStream ();
3737

3838
/// Open a file.
3939
int open (const ACEXML_Char *name);
@@ -48,12 +48,12 @@ class ACEXML_Export ACEXML_FileCharStream : public ACEXML_CharStream
4848
* Returns the available ACEXML_Char in the buffer. -1
4949
* if the object is not initialized properly.
5050
*/
51-
virtual int available (void);
51+
virtual int available ();
5252

5353
/**
5454
* Close this stream and release all resources used by it.
5555
*/
56-
virtual int close (void);
56+
virtual int close ();
5757

5858
/**
5959
* Read the next ACEXML_Char. Return -1 if we are not able to
@@ -70,29 +70,29 @@ class ACEXML_Export ACEXML_FileCharStream : public ACEXML_CharStream
7070
/**
7171
* Determine the encoding of the file.
7272
*/
73-
virtual int determine_encoding (void);
73+
virtual int determine_encoding ();
7474

7575

7676
/**
7777
* Peek the next ACEXML_Char in the CharStream. Return the
7878
* character if success, -1 if EOF is reached.
7979
*/
80-
virtual int peek (void);
80+
virtual int peek ();
8181

8282
/**
8383
* Resets the file pointer to the beginning of the stream.
8484
*/
85-
virtual void rewind (void);
85+
virtual void rewind ();
8686

8787
/*
8888
* Get the character encoding for the file.
8989
*/
90-
virtual const ACEXML_Char *getEncoding (void);
90+
virtual const ACEXML_Char *getEncoding ();
9191

9292
/*
9393
* Get the systemId for the underlying CharStream
9494
*/
95-
virtual const ACEXML_Char* getSystemId (void);
95+
virtual const ACEXML_Char* getSystemId ();
9696

9797
private:
9898

0 commit comments

Comments
 (0)