Skip to content

Commit

Permalink
Merge pull request #6186 from johnhaddon/removeGCC4Workarounds
Browse files Browse the repository at this point in the history
Remove workarounds for GCC 4.8
  • Loading branch information
ericmehl authored Dec 16, 2024
2 parents a81b17f + 61d90dd commit 8c18b04
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 14 deletions.
7 changes: 0 additions & 7 deletions src/GafferImageUI/ImageGadget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,6 @@
//
//////////////////////////////////////////////////////////////////////////

// Workaround for this bug in GCC 4.8 :
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59483
#include "boost/config.hpp"
#if defined(BOOST_GCC) && BOOST_GCC < 40900
#define protected public
#endif

#include "GafferImageUI/ImageGadget.h"

#include "GafferImage/ImageAlgo.h"
Expand Down
7 changes: 0 additions & 7 deletions src/GafferScene/MergeScenes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,6 @@
//
//////////////////////////////////////////////////////////////////////////

// Workaround for this bug in GCC 4.8 :
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59483
#include "boost/config.hpp"
#if defined(BOOST_GCC) && BOOST_GCC < 40900
#define protected public
#endif

#include "GafferScene/MergeScenes.h"

#include "GafferScene/SceneAlgo.h"
Expand Down

0 comments on commit 8c18b04

Please sign in to comment.