Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update from master #2

Merged
merged 3 commits into from
May 5, 2022
+74 −1
Merged

update from master #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
735c0f6
Restore getpid() result cast to int; resolves compile warning.
shuston Apr 25, 2022
b1bd82f
Add required operator= instances to match explicit copy ctors
shuston Apr 25, 2022
7236360
Merge pull request #1825 from DOCGroup/fix-warning-after-pr1812
shuston Apr 26, 2022
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
8 changes: 8 additions & 0 deletions ACE/ace/Atomic_Op.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, int>
ACE_Atomic_Op (int c);
ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, int> &c);
ACE_Atomic_Op<ACE_Thread_Mutex, int> &operator= (int rhs);
ACE_Atomic_Op<ACE_Thread_Mutex, int> &operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, int> &rhs);
};

template<>
Expand All @@ -280,6 +281,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, unsigned int>
ACE_Atomic_Op (unsigned int c);
ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned> &c);
ACE_Atomic_Op<ACE_Thread_Mutex, unsigned int> &operator= (unsigned int rhs);
ACE_Atomic_Op<ACE_Thread_Mutex, unsigned int> &operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned int> &rhs);
};

// If we have built in atomic op, use that, the assignment operator
Expand All @@ -293,6 +295,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, long>
ACE_Atomic_Op (long c);
ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, long> &c);
ACE_Atomic_Op<ACE_Thread_Mutex, long> &operator= (long rhs);
ACE_Atomic_Op<ACE_Thread_Mutex, long> &operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, long> &rhs);
};

template<>
Expand All @@ -318,6 +321,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, long long>
ACE_Atomic_Op (long long c);
ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, long long> &c);
ACE_Atomic_Op<ACE_Thread_Mutex, long long> &operator= (long long rhs);
ACE_Atomic_Op<ACE_Thread_Mutex, long long> &operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, long long> &c);
};

template<>
Expand All @@ -329,6 +333,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long>
ACE_Atomic_Op (unsigned long long c);
ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long> &c);
ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long> &operator= (unsigned long long rhs);
ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long> &operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long> &c);
};
#endif /* !__powerpc__ */

Expand All @@ -342,6 +347,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, short>
ACE_Atomic_Op (short c);
ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, short> &c);
ACE_Atomic_Op<ACE_Thread_Mutex, short> &operator= (short rhs);
ACE_Atomic_Op<ACE_Thread_Mutex, short> &operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, short> &c);
};

template<>
Expand All @@ -353,6 +359,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short>
ACE_Atomic_Op (unsigned short c);
ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short> &c);
ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short> &operator= (unsigned short rhs);
ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short> &operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short> &c);
};
#endif

Expand All @@ -366,6 +373,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, bool>
ACE_Atomic_Op (bool c);
ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, bool> &c);
ACE_Atomic_Op<ACE_Thread_Mutex, bool> &operator= (bool rhs);
ACE_Atomic_Op<ACE_Thread_Mutex, bool> &operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, bool> &c);
};
#endif

Expand Down
65 changes: 65 additions & 0 deletions ACE/ace/Atomic_Op.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,14 @@ ACE_Atomic_Op<ACE_Thread_Mutex, int>::operator= (int rhs)
return *this;
}

ACE_INLINE
ACE_Atomic_Op<ACE_Thread_Mutex, int>&
ACE_Atomic_Op<ACE_Thread_Mutex, int>::operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, int> &rhs)
{
ACE_Atomic_Op_GCC<int>::operator= (rhs);
return *this;
}


ACE_INLINE
ACE_Atomic_Op<ACE_Thread_Mutex, unsigned int>::ACE_Atomic_Op () :
Expand Down Expand Up @@ -471,6 +479,14 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned int>::operator= (unsigned int rhs)
return *this;
}

ACE_INLINE
ACE_Atomic_Op<ACE_Thread_Mutex, unsigned int>&
ACE_Atomic_Op<ACE_Thread_Mutex, unsigned int>::operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned int> &rhs)
{
ACE_Atomic_Op_GCC<unsigned int>::operator= (rhs);
return *this;
}

ACE_INLINE
ACE_Atomic_Op<ACE_Thread_Mutex, long>::ACE_Atomic_Op () :
ACE_Atomic_Op_GCC<long>()
Expand All @@ -497,6 +513,14 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator= (long rhs)
return *this;
}

ACE_INLINE
ACE_Atomic_Op<ACE_Thread_Mutex, long>&
ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, long> &rhs)
{
ACE_Atomic_Op_GCC<long>::operator= (rhs);
return *this;
}

ACE_INLINE
ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::ACE_Atomic_Op () :
ACE_Atomic_Op_GCC<unsigned long> ()
Expand Down Expand Up @@ -560,6 +584,14 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long long>::operator= (long long rhs)
return *this;
}

ACE_INLINE
ACE_Atomic_Op<ACE_Thread_Mutex, long long>&
ACE_Atomic_Op<ACE_Thread_Mutex, long long>::operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, long long> &rhs)
{
ACE_Atomic_Op_GCC<long long>::operator= (rhs);
return *this;
}

ACE_INLINE
ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long>::ACE_Atomic_Op () :
ACE_Atomic_Op_GCC<unsigned long long> ()
Expand All @@ -585,6 +617,15 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long>::operator= (unsigned long lo
ACE_Atomic_Op_GCC<unsigned long long>::operator= (rhs);
return *this;
}

ACE_INLINE
ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long>&
ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long>::operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long> &rhs)
{
ACE_Atomic_Op_GCC<unsigned long long>::operator= (rhs);
return *this;
}

#endif /* !__powerpc__ */

#if !defined (ACE_LACKS_GCC_ATOMIC_BUILTINS_2)
Expand Down Expand Up @@ -614,6 +655,14 @@ ACE_Atomic_Op<ACE_Thread_Mutex, short>::operator= (short rhs)
return *this;
}

ACE_INLINE
ACE_Atomic_Op<ACE_Thread_Mutex, short>&
ACE_Atomic_Op<ACE_Thread_Mutex, short>::operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, short> &rhs)
{
ACE_Atomic_Op_GCC<short>::operator= (rhs);
return *this;
}

ACE_INLINE
ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short>::ACE_Atomic_Op () :
ACE_Atomic_Op_GCC<unsigned short> ()
Expand All @@ -639,6 +688,14 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short>::operator= (unsigned short rhs)
ACE_Atomic_Op_GCC<unsigned short>::operator= (rhs);
return *this;
}

ACE_INLINE
ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short>&
ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short>::operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short> &rhs)
{
ACE_Atomic_Op_GCC<unsigned short>::operator= (rhs);
return *this;
}
#endif

#if !defined (ACE_LACKS_GCC_ATOMIC_BUILTINS_1)
Expand Down Expand Up @@ -667,6 +724,14 @@ ACE_Atomic_Op<ACE_Thread_Mutex, bool>::operator= (bool rhs)
ACE_Atomic_Op_GCC<bool>::operator= (rhs);
return *this;
}

ACE_INLINE
ACE_Atomic_Op<ACE_Thread_Mutex, bool>&
ACE_Atomic_Op<ACE_Thread_Mutex, bool>::operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, bool> &rhs)
{
ACE_Atomic_Op_GCC<bool>::operator= (rhs);
return *this;
}
#endif

#endif /* ACE_HAS_GCC_ATOMIC_BUILTINS==1 */
Expand Down
2 changes: 1 addition & 1 deletion ACE/tests/Naming_Test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ run_main (int argc, ACE_TCHAR *argv[])
ACE_TEXT ("%s%d"),
#endif
pname,
ACE_OS::getpid ());
(int)ACE_OS::getpid ());

name_options->database (temp_file);
}
Expand Down