Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ACE/bin/copy-local-script.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

for i in *.gz *.bz2 *.zip *.md5; do
d=`echo $i | sed 's/\.[tz][ai][rp]/-8.0.3&/'`
d=`echo $i | sed 's/\.[tz][ai][rp]/-8.0.4&/'`
echo "Copying $i to $d"
cp -ip $i $d
done
Expand Down
9 changes: 6 additions & 3 deletions ACE/examples/APG/Containers/KeyType.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@ class KeyType
public:
friend bool operator == (const KeyType&, const KeyType&);

KeyType () : val_(0) {}
KeyType () = default;
KeyType (int i) : val_(i) {}
KeyType (const KeyType& kt) { this->val_ = kt.val_; };
KeyType (const KeyType&) = default;
KeyType (KeyType&&) = default;
KeyType& operator= (const KeyType&) = default;
KeyType& operator= (KeyType&&) = default;
operator int() const { return val_; };

private:
int val_;
int val_ {};
};

bool operator == (const KeyType& a, const KeyType& b)
Expand Down
22 changes: 11 additions & 11 deletions ACE/examples/APG/Streams/Answerer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
class AnswerIncomingCall : public BasicTask
{
protected:
virtual int process (Message *message)
int process (Message *message) override
{
ACE_TRACE ("AnswerIncomingCall::process()");

Expand All @@ -29,7 +29,7 @@ class AnswerIncomingCall : public BasicTask
ACE_TEXT ("%p\n"),
ACE_TEXT ("AnswerIncomingCall")),
-1);
return 0;
return 0;
}
};
// Listing 21
Expand All @@ -38,7 +38,7 @@ class AnswerIncomingCall : public BasicTask
class GetCallerId : public BasicTask
{
protected:
virtual int process (Message *message)
int process (Message *message) override
{
ACE_TRACE ("GetCallerId::process()");

Expand All @@ -60,7 +60,7 @@ class GetCallerId : public BasicTask
class PlayOutgoingMessage : public BasicTask
{
protected:
virtual int process (Message *message)
int process (Message *message) override
{
ACE_TRACE ("PlayOutgoingMessage::process()");

Expand Down Expand Up @@ -90,7 +90,7 @@ class PlayOutgoingMessage : public BasicTask
class RecordIncomingMessage : public BasicTask
{
protected:
virtual int process (Message *message)
int process (Message *message) override
{
ACE_TRACE ("RecordIncomingMessage::process()");

Expand Down Expand Up @@ -121,7 +121,7 @@ class RecordIncomingMessage : public BasicTask
class ReleaseDevice : public BasicTask
{
protected:
virtual int process (Message *message)
int process (Message *message) override
{
ACE_TRACE ("ReleaseDevice::process()");
message->recorder ()->release ();
Expand All @@ -134,7 +134,7 @@ class ReleaseDevice : public BasicTask
class EncodeMessage : public BasicTask
{
protected:
virtual int process (Message *message)
int process (Message *message) override
{
ACE_TRACE ("EncodeMessage::process()");

Expand Down Expand Up @@ -165,7 +165,7 @@ class EncodeMessage : public BasicTask
class SaveMetaData : public BasicTask
{
protected:
virtual int process (Message *message)
int process (Message *message) override
{
ACE_TRACE ("SaveMetaData::process()");

Expand Down Expand Up @@ -203,7 +203,7 @@ class SaveMetaData : public BasicTask
class NotifySomeone : public BasicTask
{
protected:
virtual int process (Message *message)
int process (Message *message) override
{
ACE_TRACE ("NotifySomeone::process()");

Expand Down Expand Up @@ -235,8 +235,8 @@ class RecordingStream : public ACE_Stream<ACE_MT_SYNCH>

//FUZZ: disable check_for_lack_ACE_OS
// Listing 1000 code/ch18
virtual int open (void *arg,
Module *head = 0, Module *tail = 0)
int open (void *arg,
Module *head = 0, Module *tail = 0) override
{
//FUZZ: enable check_for_lack_ACE_OS
if (tail == 0)
Expand Down
9 changes: 6 additions & 3 deletions ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@
* handle_input(). It also checks wether the counter is greater than zero
* indicating, that handle_input() has been called before.
*/
#define INVOCATION_ENTER() do { if (mInvocationCounter > 0) \
ACE_ERROR((LM_ERROR, ACE_TEXT("Multiple invocations detected.\n"))); \
mInvocationCounter++; } while (0)
#define INVOCATION_ENTER() \
do { \
if (mInvocationCounter > 0) \
ACE_ERROR((LM_ERROR, ACE_TEXT("Multiple invocations detected.\n"))); \
mInvocationCounter++; } \
while (0)

/**
* THis macro is the counter part to INVOCATION_ENTER(). It decreases the
Expand Down
Loading