Skip to content

Commit

Permalink
Typed[Object]Plug : Move .inl to Implementation.h
Browse files Browse the repository at this point in the history
We use `.inl` files to store inline implementation that we want the compiler to see, but which we don't want to clutter up the header with, so the headers are more human-readable. These files don't match that pattern - they're to be included in a single `.cpp` file and used to explicitly instantiate the template.
  • Loading branch information
johnhaddon committed Jul 11, 2023
1 parent b5dbb62 commit 4ac716f
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@ Breaking Changes
- The `display` and `view` default values are now interpreted as the default defined by the current OpenColorIO config, rather than as invalid values. This means that a node without `display` or `view` specified is no longer a pass-through as it was before.
- gaffer test : Replaced `-performanceOnly` flag with `-category` argument which may be set to `performance` for the same as the old `-performanceOnly`, or `standard` for the converse.
- VisibleSet : Renamed `VisibleSet::match()` to `visibility()` and changed return type.
- TypedPlug : Moved implementation code from `TypedPlug.inl` to `TypedPlugImplementation.h`.
- TypedObjectPlug : Moved implementation code from `TypedObjectPlug.inl` to `TypedObjectPlugImplementation.h`.

Build
-----
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/Gaffer/TypedObjectPlug.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#include "Gaffer/TypedObjectPlug.h"

#include "Gaffer/StringPlug.h"
#include "Gaffer/TypedObjectPlug.inl"
#include "Gaffer/TypedObjectPlugImplementation.h"

#include "boost/algorithm/string/classification.hpp"
#include "boost/algorithm/string/split.hpp"
Expand Down
2 changes: 1 addition & 1 deletion src/Gaffer/TypedPlug.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

#include "Gaffer/NumericPlug.h"
#include "Gaffer/StringPlug.h"
#include "Gaffer/TypedPlug.inl"
#include "Gaffer/TypedPlugImplementation.h"

namespace Gaffer
{
Expand Down
2 changes: 1 addition & 1 deletion src/GafferImage/AtomicFormatPlug.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#include "Gaffer/Context.h"
#include "Gaffer/Process.h"
#include "Gaffer/TypedPlug.h"
#include "Gaffer/TypedPlug.inl"
#include "Gaffer/TypedPlugImplementation.h"

using namespace Gaffer;
using namespace GafferImage;
Expand Down

0 comments on commit 4ac716f

Please sign in to comment.