Skip to content

[0.4.x] libvisual + libvisual-plugins: Require a C++11 compiler #276

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

Merged
hartwork merged 5 commits into from
Feb 14, 2023
Merged

[0.4.x] libvisual + libvisual-plugins: Require a C++11 compiler #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
17a590e
Plugins (gforce): Resolve multi-character character constants
hartwork Feb 6, 2023
7a89960
libvisual: Run autoreconf twice if necessary
hartwork Feb 6, 2023
a465f68
Plugins: Run autoreconf twice if necessary
hartwork Feb 6, 2023
fe248f8
libvisual: Require a C++11 compiler + enable C++11 features
hartwork Feb 5, 2023
8ca2622
Plugins: Require a C++11 compiler + enable C++11 features
hartwork Feb 5, 2023
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
1 change: 1 addition & 0 deletions .github/workflows/enforce-copies-of-help-output-in-sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install --yes --no-install-recommends \
autoconf-archive \
autopoint \
gettext \
help2man \
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/linux_and_macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ jobs:
# > is to be installed
sudo apt-get install --yes --no-install-recommends libunwind-dev
sudo apt-get install --yes --no-install-recommends \
autoconf-archive \
autopoint \
bison \
doxygen \
Expand Down Expand Up @@ -93,6 +94,7 @@ jobs:
if: runner.os == 'macOS'
run: |-
brew install \
autoconf-archive \
automake \
bison \
doxygen \
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/translations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
# > is to be installed
sudo apt-get install --yes --no-install-recommends libunwind-dev
sudo apt-get install --yes --no-install-recommends \
autoconf-archive \
autopoint \
bison \
doxygen \
Expand Down
1 change: 1 addition & 0 deletions libvisual-plugins/autogen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ if [[ "$(uname -s)" == Darwin ]]; then
echo 'AC_DEFUN([AM_PATH_ALSA], [HAVE_ALSA=no])' > acinclude.m4
fi

autoreconf --install --verbose --force || \
autoreconf --install --verbose --force

if [[ -z "${NOCONFIGURE:-}" ]]; then
Expand Down
1 change: 1 addition & 0 deletions libvisual-plugins/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ AC_PROG_CXX
dnl Check for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_C_INLINE
AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])

dnl 'Standard' header files.
AC_CHECK_HEADERS([fcntl.h unistd.h stdlib.h string.h sys/time.h])
Expand Down
4 changes: 3 additions & 1 deletion libvisual-plugins/plugins/actor/G-Force/Common/io/CEgIOFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
#include <cstdint>

#include "CEgIOFile.h"


#include "CEgFileSpec.h"


long CEgIOFile::sCreatorType = '????';
long CEgIOFile::sCreatorType = *reinterpret_cast<const int32_t*>("????");


CEgIOFile::CEgIOFile( int inDoTrunc, long inOBufSize ) :
Expand Down
6 changes: 4 additions & 2 deletions libvisual-plugins/plugins/actor/G-Force/Common/io/Headers/CEgFileSpec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
#define _CEGFILESPEC_


#include <cstdint>

#include "UtilStr.h"
#include "CEgErr.h"

Expand All @@ -15,7 +17,7 @@ class CEgFileSpec {

public:
CEgFileSpec();
CEgFileSpec( const char* inPathName, long inType = 'TEXT' );
CEgFileSpec( const char* inPathName, long inType = *reinterpret_cast<const int32_t*>("TEXT") );
CEgFileSpec( const CEgFileSpec& inSpec );


Expand All @@ -28,7 +30,7 @@ class CEgFileSpec {

void Assign( const CEgFileSpec& inSpec );
void AssignPathName( const char* inPathName );
void Assign( const void* inOSSpecPtr, long inType = 'TEXT' );
void Assign( const void* inOSSpecPtr, long inType = *reinterpret_cast<const int32_t*>("TEXT") );

CEgErr Duplicate( const CEgFileSpec& inDestSpec ) const;
void SaveAs( const CEgFileSpec& inDestSpec ) const;
Expand Down
6 changes: 3 additions & 3 deletions libvisual-plugins/plugins/actor/G-Force/Common/io/Prefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Prefs::Prefs( const char* inPrefsName, bool inSysStored ) {
theDirID = ( (FSSpec*) EgOSUtils::sAppSpec.OSSpec() ) -> parID;
}
::FSMakeFSSpec( theVRef, theDirID, mPrefName.getPasStr(), &prefSpec );
mFileSpec.Assign( &prefSpec, 'TEXT' );
mFileSpec.Assign( &prefSpec, *reinterpret_cast<const int32_t*>("TEXT"); );
#endif

#ifdef EG_WIN
Expand Down Expand Up @@ -80,9 +80,9 @@ CEgErr Prefs::Store() {
if ( mDirty ) {
long origType = CEgIOFile::sCreatorType;
#if EG_MAC
CEgIOFile::sCreatorType = 'ttxt';
CEgIOFile::sCreatorType = *reinterpret_cast<const int32_t*>("ttxt");
#elif EG_WIN
CEgIOFile::sCreatorType = '????';
CEgIOFile::sCreatorType = *reinterpret_cast<const int32_t*>("????");
#endif

oFile.open( &mFileSpec );
Expand Down
1 change: 1 addition & 0 deletions libvisual/autogen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

set -e -u

autoreconf --install --verbose --force || \
autoreconf --install --verbose --force

if [[ -z "${NOCONFIGURE:-}" ]]; then
Expand Down
1 change: 1 addition & 0 deletions libvisual/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ AC_HEADER_DIRENT
AC_CHECK_HEADERS([fcntl.h sys/types.h stdlib.h string.h sys/time.h unistd.h sched.h sys/sched.h])

# Checks for typedefs, structures, and compiler characteristics.
AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
AC_C_CONST
AC_C_INLINE
AC_TYPE_SIZE_T
Expand Down