Commit b194e7ff authored by T.J. Corona's avatar T.J. Corona
Browse files

Fix duplicate definition of dummy Sentinel struct

parent 5ab82ba0
......@@ -18,6 +18,10 @@
#include <memory>
#include <unordered_set>
#ifdef SMTK_MSVC
#include "smtk/plugin/Sentinel.h"
#endif
namespace smtk
{
namespace plugin
......@@ -73,13 +77,6 @@ private:
#else
namespace detail
{
struct Sentinel
{
};
}
template <typename Registrar, typename Manager = detail::Sentinel, typename... T>
class SMTK_ALWAYS_EXPORT Client : public detail::Client<Registrar, Manager>,
public Client<Registrar, T...>
......
......@@ -22,6 +22,10 @@
#include <utility>
#include <vector>
#ifdef SMTK_MSVC
#include "smtk/plugin/Sentinel.h" "
#endif
namespace smtk
{
namespace plugin
......@@ -351,13 +355,6 @@ private:
#else
namespace detail
{
struct Sentinel
{
};
}
template <typename Registrar, typename Manager = detail::Sentinel, typename... T>
class Registry : public detail::MaybeRegister<Registrar, Manager,
typename detail::RegistersTo<Registrar, Manager>::type>,
......
//=========================================================================
// Copyright (c) Kitware, Inc.
// All rights reserved.
// See LICENSE.txt for details.
//
// This software is distributed WITHOUT ANY WARRANTY; without even
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
// PURPOSE. See the above copyright notice for more information.
//=========================================================================
#ifndef __smtk_plugin_Sentinel_h
#define __smtk_plugin_Sentinel_h
#include "smtk/CoreExports.h"
namespace smtk
{
namespace plugin
{
namespace detail
{
struct SMTKCORE_EXPORT Sentinel
{
};
}
}
}
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment