Commit 7f2d1878 authored by Ben Boeckel's avatar Ben Boeckel

shiboken: remove SHIBOKEN_SKIP checks

Now that Shiboken is not supported, the blocks aren't necessary.
parent 2917e1a1
......@@ -60,12 +60,11 @@ function(determineFunctionType found type ptype incType)
// \"using namespace smtk::placeholders;\"
// in your code anyway (for people using C++11 or tr1).
")
set(INCLUDE_RESULT "#ifndef SHIBOKEN_SKIP
# include <boost/function.hpp>
# include <boost/bind.hpp>
# include <boost/functional.hpp>
# include <boost/mpl/placeholders.hpp> // for _1, _2, ..., _N
#endif
set(INCLUDE_RESULT "
#include <boost/function.hpp>
#include <boost/bind.hpp>
#include <boost/functional.hpp>
#include <boost/mpl/placeholders.hpp> // for _1, _2, ..., _N
")
set(${type}_BOOST_TRUE TRUE PARENT_SCOPE)
endif()
......
......@@ -266,11 +266,9 @@ typedef smtk::shared_ptr<smtk::model::Operator> OperatorPtr;
typedef smtk::weak_ptr<smtk::model::Operator> WeakOperatorPtr;
typedef std::set<smtk::model::OperatorPtr> Operators;
typedef smtk::shared_ptr<smtk::model::RemoteOperator> RemoteOperatorPtr;
#ifndef SHIBOKEN_SKIP
typedef std::function<smtk::model::OperatorPtr()> OperatorConstructor;
typedef std::pair<std::string, OperatorConstructor> StaticOperatorInfo;
typedef std::map<std::string, StaticOperatorInfo> OperatorConstructors;
#endif
typedef smtk::shared_ptr<smtk::model::StoredResource> StoredResourcePtr;
typedef smtk::shared_ptr<const smtk::model::StoredResource> ConstStoredResourcePtr;
typedef smtk::shared_ptr<smtk::model::Entity> EntityPtr;
......
......@@ -40,7 +40,6 @@
* These types are useful when dealing with shared pointers
* in a class hierarchy.
*/
#ifndef SHIBOKEN_SKIP
#define smtkTypeMacro(...) \
typedef __VA_ARGS__ SelfType; \
typedef smtk::shared_ptr<__VA_ARGS__> Ptr; \
......@@ -48,15 +47,6 @@
typedef smtk::weak_ptr<__VA_ARGS__> WeakPtr; \
typedef smtk::weak_ptr<const __VA_ARGS__> WeakConstPtr; \
virtual std::string classname() const { return #__VA_ARGS__; }
#else
// This is required because shiboken cannot properly parse the #__VA_ARGS__ in classname() above:
#define smtkTypeMacro(...) \
typedef __VA_ARGS__ SelfType; \
typedef smtk::shared_ptr<__VA_ARGS__> Ptr; \
typedef smtk::shared_ptr<const __VA_ARGS__> ConstPtr; \
typedef smtk::weak_ptr<__VA_ARGS__> WeakPtr; \
typedef smtk::weak_ptr<const __VA_ARGS__> WeakConstPtr
#endif
/**\brief Add a typedef to the superclass of this class.
*
......
......@@ -242,7 +242,6 @@ protected:
this->m_references.erase(attRefItem);
}
#ifndef SHIBOKEN_SKIP
std::string m_name;
std::vector<smtk::attribute::ItemPtr> m_items;
ModelEntityItemPtr m_associations;
......@@ -258,7 +257,6 @@ protected:
// would need to be done otherwise
bool m_aboutToBeDeleted;
double m_color[4];
#endif // SHIBOKEN_SKIP
};
inline smtk::simulation::UserDataPtr Attribute::userData(const std::string& key) const
......
......@@ -60,10 +60,8 @@ public:
protected:
DateTimeItem(Attribute* owningAttribute, int itemPosition);
DateTimeItem(Item* owningItem, int myPosition, int mySubGroupPosition);
#ifndef SHIBOKEN_SKIP
virtual bool setDefinition(smtk::attribute::ConstItemDefinitionPtr def);
ConstDateTimeItemDefinitionPtr itemDefinition() const;
#endif
std::vector< ::smtk::common::DateTimeZonePair> m_values;
std::vector<bool> m_isSet;
......
......@@ -101,13 +101,11 @@ public:
const std::map<std::string, std::set<std::string> >& analyses() const { return this->m_analyses; }
std::size_t numberOfAdvanceLevels() const { return this->m_advLevels.size(); }
#ifndef SHIBOKEN_SKIP
void addAdvanceLevel(int level, std::string label, const double* l_color = 0);
const std::map<int, std::string>& advanceLevels() const { return this->m_advLevels; }
// the color is expected in the format of double[4] - rgba
const double* advanceLevelColor(int level) const;
void setAdvanceLevelColor(int level, const double* l_color);
#endif
// For Reader classes
smtk::attribute::AttributePtr createAttribute(
......
......@@ -9,7 +9,6 @@
//=============================================================================
#ifndef __smtk_bridge_polygon_internal_bpConfig_h
#define __smtk_bridge_polygon_internal_bpConfig_h
#ifndef SHIBOKEN_SKIP
#include "smtk/SharedPtr.h"
#include "smtk/common/CompilerInformation.h"
......@@ -62,5 +61,4 @@ typedef std::map<Point, VertexPtr> VertexById;
} // namespace bridge
} // namespace smtk
#endif // SHIBOKEN_SKIP
#endif // __smtk_bridge_polygon_internal_bpConfig_h
......@@ -7,7 +7,6 @@
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
// PURPOSE. See the above copyright notice for more information.
//=========================================================================
#ifndef SHIBOKEN_SKIP
#include "smtk/bridge/remote/RemusConnection.h"
#include "smtk/bridge/remote/Session.h"
......@@ -698,4 +697,3 @@ bool RemusConnection::findRequirementsForRemusType(
} // namespace remote
} // namespace bridge
} // namespace smtk
#endif // SHIBOKEN_SKIP
......@@ -18,7 +18,6 @@
#include "smtk/common/UUID.h"
#ifndef SHIBOKEN_SKIP
#include "remus/client/Client.h"
#include "remus/client/ServerConnection.h"
......@@ -28,7 +27,6 @@
#include "remus/proto/JobRequirements.h"
#include "cJSON.h"
#endif // SHIBOKEN_SKIP
#include <map>
#include <set>
......@@ -75,22 +73,14 @@ public:
void addSearchDir(const std::string& searchDir);
void clearSearchDirs(bool clearDefaultsToo = false);
#ifndef SHIBOKEN_SKIP
bool connectToServer(
const std::string& hostname = "local", int port = remus::server::CLIENT_PORT);
#else
// Shiboken cannot parse the default port and does not
// properly handle default arguments anyway, so provide
// something for it to wrap:
bool connectToServer(const std::string& hostname, int port);
#endif
std::vector<std::string> sessionTypeNames();
int staticSetup(const std::string& sessionName, const std::string& optName,
const smtk::model::StringList& optVal);
#ifndef SHIBOKEN_SKIP
smtk::common::UUID beginSession(const std::string& sessionName);
bool endSession(const smtk::common::UUID& sessionId);
SessionPtr findSession(const smtk::common::UUID& sessionId);
......@@ -136,7 +126,6 @@ protected:
smtk::model::ManagerPtr m_modelMgr;
std::map<std::string, std::string> m_remoteSessionNameToType;
std::map<smtk::common::UUID, std::string> m_remoteSessionRefIds;
#endif // SHIBOKEN_SKIP
};
} // namespace remote
......
......@@ -7,7 +7,6 @@
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
// PURPOSE. See the above copyright notice for more information.
//=========================================================================
#ifndef SHIBOKEN_SKIP
#include "smtk/bridge/remote/RemusConnections.h"
#include "smtk/bridge/remote/RemusConnection.h"
......@@ -84,4 +83,3 @@ RemusConnection::Ptr RemusConnections::connectToServer(const std::string& host,
} // namespace remote
} // namespace bridge
} // namespace smtk
#endif // SHIBOKEN_SKIP
......@@ -7,7 +7,6 @@
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
// PURPOSE. See the above copyright notice for more information.
//=========================================================================
#ifndef SHIBOKEN_SKIP
#include "smtk/bridge/remote/RemusRPCWorker.h"
#include "smtk/bridge/remote/Session.h"
......@@ -370,4 +369,3 @@ void RemusRPCWorker::generateError(cJSON* err, const std::string& errMsg, const
} // namespace remote
} // namespace bridge
} // namespace smtk
#endif // SHIBOKEN_SKIP
......@@ -13,10 +13,8 @@
#include "smtk/PublicPointerDefs.h"
#include "smtk/SharedFromThis.h"
#ifndef SHIBOKEN_SKIP
#include "remus/worker/Job.h"
#include "remus/worker/Worker.h"
#endif // SHIBOKEN_SKIP
#include "smtk/model/StringData.h"
......@@ -54,10 +52,8 @@ public:
virtual void setOption(const std::string& optName, const std::string& optVal);
virtual void clearOptions();
#ifndef SHIBOKEN_SKIP
void processJob(
remus::worker::Worker*& w, remus::worker::Job& jd, remus::proto::JobRequirements& r);
#endif // SHIBOKEN_SKIP
smtk::model::ManagerPtr manager();
void setManager(smtk::model::ManagerPtr);
......@@ -65,12 +61,10 @@ public:
protected:
RemusRPCWorker();
#ifndef SHIBOKEN_SKIP
void generateError(cJSON* err, const std::string& errMsg, const std::string& reqId);
smtk::model::ManagerPtr m_modelMgr;
smtk::model::StringData m_options;
#endif // SHIBOKEN_SKIP
private:
RemusRPCWorker(const RemusRPCWorker&); // Not implemented.
......
......@@ -9,7 +9,6 @@
// PURPOSE. See the above copyright notice for more information.
//
//=============================================================================
#ifndef SHIBOKEN_SKIP
#include "smtk/bridge/remote/RemusStaticSessionInfo.h"
#include "smtk/bridge/remote/RemusConnection.h"
......@@ -97,4 +96,3 @@ smtk::model::SessionPtr RemusStaticSessionInfo::operator()() const
} // namespace remote
} // namespace bridge
} // namespace smtk
#endif // SHIBOKEN_SKIP
......@@ -11,7 +11,6 @@
//=============================================================================
#ifndef __smtk_session_remote_RemusStaticSessionInfo_h
#define __smtk_session_remote_RemusStaticSessionInfo_h
#ifndef SHIBOKEN_SKIP
#include "smtk/PublicPointerDefs.h"
#include "smtk/bridge/remote/Exports.h"
......@@ -70,5 +69,4 @@ public:
} // namespace bridge
} // namespace smtk
#endif // SHIBOKEN_SKIP
#endif // __smtk_session_remote_RemusStaticSessionInfo_h
......@@ -7,7 +7,6 @@
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
// PURPOSE. See the above copyright notice for more information.
//=========================================================================
#ifndef SHIBOKEN_SKIP
#include "smtk/bridge/remote/Session.h"
#include "smtk/bridge/remote/RemusConnection.h"
......@@ -183,4 +182,3 @@ smtkImplementsModelingKernel(
SMTKREMOTESESSION_EXPORT, remus_remote, "", smtk::model::SessionHasNoStaticSetup,
smtk::bridge::remote::Session, false /* do not inherit local operators */
);
#endif // SHIBOKEN_SKIP
......@@ -10,16 +10,13 @@
#ifndef __smtk_session_remote_Session_h
#define __smtk_session_remote_Session_h
#ifndef SHIBOKEN_SKIP
#include "smtk/bridge/remote/RemusStaticSessionInfo.h"
#include "smtk/model/SessionRegistrar.h"
#endif // SHIBOKEN_SKIP
#include "smtk/SharedPtr.h" // for export macro
#include "smtk/bridge/remote/Exports.h" // for export macro
#include "smtk/bridge/remote/RemusStaticSessionInfo.h"
#include "smtk/model/DefaultSession.h"
#include "smtk/model/SessionRegistrar.h"
#include "smtk/model/StringData.h"
#ifndef SHIBOKEN_SKIP
#ifndef _MSC_VER
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor"
......@@ -29,7 +26,6 @@
#ifndef _MSC_VER
#pragma GCC diagnostic pop
#endif
#endif // SHIBOKEN_SKIP
namespace smtk
{
......@@ -74,7 +70,6 @@ public:
virtual ~Session();
using smtk::model::Session::setup;
#ifndef SHIBOKEN_SKIP
Ptr setup(RemusConnection* remusServerConnection, remus::proto::JobRequirements& jreq);
remus::proto::JobRequirements remusRequirements() const;
......@@ -104,7 +99,6 @@ protected:
static std::map<std::string, RemusStaticSessionInfo>* s_remotes;
static void cleanupSessionTypes();
#endif // SHIBOKEN_SKIP
};
} // namespace remote
......
......@@ -16,8 +16,6 @@
#pragma warning(disable : 4267)
#endif
#ifndef SHIBOKEN_SKIP
#include "smtk/Options.h"
#include "smtk/SharedPtr.h"
......@@ -187,4 +185,3 @@ int main(int argc, char* argv[])
server.waitForBrokeringToFinish();
return valid ? 0 : 1;
}
#endif // SHIBOKEN_SKIP
......@@ -19,7 +19,6 @@
// Steal code from CMB's vtkModelManagerWrapper.
#ifndef SHIBOKEN_SKIP
#include "smtk/bridge/remote/RemusRPCWorker.h"
#include "smtk/bridge/remote/Session.h"
......@@ -445,4 +444,3 @@ int main(int argc, char* argv[])
delete w;
return 0;
}
#endif // SHIBOKEN_SKIP
......@@ -7,7 +7,6 @@
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
// PURPOSE. See the above copyright notice for more information.
//=========================================================================
#ifndef SHIBOKEN_SKIP
#include "smtk/bridge/remote/RemusConnection.h"
#include "smtk/bridge/remote/Session.h"
......@@ -142,4 +141,3 @@ int main(int argc, char* argv[])
return 0;
}
#endif // SHIBOKEN_SKIP
......@@ -15,11 +15,9 @@
#include "smtk/common/CompilerInformation.h"
#include "smtk/common/TimeZone.h"
#ifndef SHIBOKEN_SKIP
SMTK_THIRDPARTY_PRE_INCLUDE
#include <boost/date_time/posix_time/ptime.hpp>
SMTK_THIRDPARTY_POST_INCLUDE
#endif
#include <iostream>
#include <string>
......@@ -51,9 +49,6 @@ public:
return this->setComponents(year, month, day, hour, minute, second, millisecond, NULL);
}
#ifndef SHIBOKEN_SKIP
// Reimplemented in Shiboken typesystem
// Returns each component WITH time zone conversion
bool components(TimeZone timeZone, int& year, int& month, int& day, int& hour, int& minute,
int& second, int& millisecond) const
......@@ -67,7 +62,6 @@ public:
{
return this->components(year, month, day, hour, minute, second, millisecond, NULL);
}
#endif
/// Indicates if instance represents valid datetime value
bool isSet() const;
......@@ -90,7 +84,6 @@ public:
bool operator>(const DateTime& dt) const;
protected:
#ifndef SHIBOKEN_SKIP
boost::posix_time::ptime m_ptime;
bool setComponents(int year, int month, int day, int hour, int minute, int second,
......@@ -98,8 +91,6 @@ protected:
bool components(int& year, int& month, int& day, int& hour, int& minute, int& second,
int& millisecond, TimeZone* timeZone) const;
#endif
};
} // namespace common
......
......@@ -7,7 +7,6 @@
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
// PURPOSE. See the above copyright notice for more information.
//=========================================================================
#ifndef SHIBOKEN_SKIP
#include "smtk/common/StringUtil.h"
#include "smtk/Function.h" // for smtk::bind
......@@ -39,9 +38,9 @@ std::string& StringUtil::trim(std::string& s)
std::string& StringUtil::trimLeft(std::string& s)
{
s.erase(s.begin(),
std::find_if(s.begin(), s.end(),
std::not1(std::ptr_fun<int, int>(isspace //smtk::bind(std::isspace<char>, _1, safeLocale)
))));
std::find_if(s.begin(), s.end(), std::not1(std::ptr_fun<int, int>(
isspace //smtk::bind(std::isspace<char>, _1, safeLocale)
))));
return s;
}
......@@ -93,5 +92,3 @@ std::vector<std::string> StringUtil::split(
} // namespace common
} // namespace smtk
#endif // SHIBOKEN_SKIP
......@@ -14,11 +14,9 @@
#include "smtk/SystemConfig.h"
#include "smtk/common/CompilerInformation.h"
#ifndef SHIBOKEN_SKIP
SMTK_THIRDPARTY_PRE_INCLUDE
#include <boost/date_time/local_time/local_time.hpp>
SMTK_THIRDPARTY_POST_INCLUDE
#endif
#include <string>
......@@ -58,10 +56,9 @@ public:
bool utcOffset(int& hours, int& minutes) const;
bool dstShift(int& hours, int& minutes) const;
#ifndef SHIBOKEN_SKIP
// Intended for internal use
const boost::local_time::time_zone_ptr boostPointer() const;
#endif
private:
boost::local_time::time_zone_ptr m_boostTimeZone;
bool m_isUTC;
......
......@@ -16,11 +16,9 @@
#include "smtk/common/CompilerInformation.h"
#ifndef SHIBOKEN_SKIP
SMTK_THIRDPARTY_PRE_INCLUDE
#include <boost/uuid/uuid.hpp>
SMTK_THIRDPARTY_POST_INCLUDE
#endif
#include <iostream>
#include <set>
......
......@@ -93,11 +93,9 @@ public:
~View();
// Copy the contents of one View into another - this View will be the same as
// v with the exception of its title and type
#ifndef SHIBOKEN_SKIP
// Copy the contents of one View into another - this View will be the same as
// v with the exception of its title and type
void copyContents(const View& v);
#endif
const std::string& title() const { return this->m_title; }
const std::string& type() const { return this->m_type; }
......
......@@ -10,7 +10,6 @@
#ifndef __smtk_extension_vtk_io_RedirectOutput_h
#define __smtk_extension_vtk_io_RedirectOutput_h
#ifndef SHIBOKEN_SKIP
#include "smtk/PublicPointerDefs.h"
#include "smtk/extension/vtk/io/IOVTKExports.h"
......@@ -43,4 +42,3 @@ SMTKIOVTK_EXPORT void ResetVTKOutput();
}
#endif
#endif
......@@ -60,11 +60,10 @@ public:
void includeViews(bool val) { this->m_includeViews = val; }
protected:
#ifndef SHIBOKEN_SKIP
// Instantiates internal writer
// Caller is responsible for deleting the instance
XmlStringWriter* newXmlStringWriter(const smtk::attribute::SystemPtr system) const;
#endif
private:
unsigned int m_fileVersion;
bool m_includeDefinitions;
......
......@@ -33,12 +33,10 @@ public:
ExportMesh();
~ExportMesh();
#ifndef SHIBOKEN_SKIP
ExportMesh& operator=(const ExportMesh&) = delete;
ExportMesh(const ExportMesh&) = delete;
static std::vector<smtk::io::mesh::MeshIOPtr>& SupportedIOTypes();
#endif
bool operator()(const std::string& filePath, smtk::mesh::CollectionPtr collection) const;
bool operator()(const std::string& filePath, smtk::mesh::CollectionPtr collection,
......
......@@ -33,7 +33,6 @@ public:
ImportMesh();
~ImportMesh();
#ifndef SHIBOKEN_SKIP
ImportMesh& operator=(const ImportMesh&) = delete;
ImportMesh(const ImportMesh&) = delete;
......@@ -47,7 +46,6 @@ public:
std::string domainPropertyName = std::string()) const;
bool operator()(const std::string& filePath, smtk::mesh::CollectionPtr collection,
std::string domainPropertyName = std::string()) const;
#endif
};
SMTKCORE_EXPORT smtk::mesh::CollectionPtr importMesh(
......
......@@ -33,14 +33,12 @@ public:
ReadMesh();
~ReadMesh();
#ifndef SHIBOKEN_SKIP
ReadMesh& operator=(const ReadMesh&) = delete;
ReadMesh(const ReadMesh&) = delete;
static std::vector<smtk::io::mesh::MeshIOPtr>& SupportedIOTypes();
static bool ExtensionIsSupported(const std::string& ext);
#endif
//Load the domain sets from a moab data file as a new collection into the
//given manager.
......
......@@ -18,9 +18,7 @@
#include "smtk/model/EntityIterator.h" // For IteratorStyle
#include "smtk/model/Manager.h" // For UUIDWithEntity
#ifndef SHIBOKEN_SKIP
#include "cJSON.h"
#endif // SHIBOKEN_SKIP
namespace smtk
{
......@@ -163,13 +161,8 @@ public:
// JSON-RPC helpers:
static cJSON* createRPCRequest(
const std::string& method, const std::string& params, const std::string& reqId);
#ifndef SHIBOKEN_SKIP
static cJSON* createRPCRequest(const std::string& method, cJSON*& params,
const std::string& reqId, int paramsType = cJSON_Array);
#else
static cJSON* createRPCRequest(
const std::string& method, cJSON*& params, const std::string& reqId, int paramsType);
#endif
// Low-level helpers:
static cJSON* createStringArray(const std::vector<std::string>& arr);
......
......@@ -33,12 +33,10 @@ public:
WriteMesh();
~WriteMesh();
#ifndef SHIBOKEN_SKIP
WriteMesh& operator=(const WriteMesh&) = delete;
WriteMesh(const WriteMesh&) = delete;
static std::vector<smtk::io::mesh::MeshIOPtr>& SupportedIOTypes();
#endif
bool operator()(const std::string& filePath, smtk::mesh::CollectionPtr collection,
mesh::Subset subset = mesh::Subset::EntireCollection) const;
......
......@@ -63,7 +63,6 @@ struct SMTKCORE_EXPORT Format
{
}
#ifndef SHIBOKEN_SKIP
static const IOFlags Import;
static const IOFlags Export;
static const IOFlags Read;
......@@ -73,7 +72,6 @@ struct SMTKCORE_EXPORT Format
bool CanExport() const { return (this->Flags & Export) == Export; }
bool CanRead() const { return (this->Flags & Read) == Read; }
bool CanWrite() const { return (this->Flags & Write) == Write; }
#endif
std::string Name;
std::vector<std::string> Extensions;
......
......@@ -23,7 +23,6 @@ namespace smtk
namespace mesh
{
#ifndef SHIBOKEN_SKIP
// deform each point in a meshset according to an R^3->R^3 mapping.
SMTKCORE_EXPORT
bool applyWarp(const std::function<std::array<double, 3>(std::array<double, 3>)>&,
......@@ -57,7 +56,6 @@ bool applyVectorPointField(const std::function<std::array<double, 3>(std::array<
SMTKCORE_EXPORT
bool applyVectorCellField(const std::function<std::array<double, 3>(std::array<double, 3>)>&,
const std::string& name, smtk::mesh::MeshSet& ms);
#endif
}
}
......
......@@ -84,7 +84,6 @@ public:
//a success flag. <values> must be at least size() * dimension() in length.
bool set(const std::vector<double>& values);
#ifndef SHIBOKEN_SKIP
//Get the data associated with all of the cells in the meshset and return
//a success flag. <values> must be at least cellIds.size() * dimension() in
//length.
......@@ -102,7 +101,6 @@ public:
//Set the data associated with all of the cells in the meshset and return
//a success flag. <values> must be at least size() * dimension() in length.
bool set(const double* const values);
#endif
private:
std::string m_name;
......
......@@ -59,7 +59,6 @@ class SMTKCORE_EXPORT Collection : public smtk::enable_shared_from_this<Collecti
//default constructor generates an invalid collection
Collection();
#ifndef SHIBOKEN_SKIP
//Construct a valid collection that is associated with a manager
//but has an empty interface that can be populated
Collection(const smtk::common::UUID& collectionID, smtk::mesh::ManagerPtr mngr);
......@@ -69,7 +68,6 @@ class SMTKCORE_EXPORT Collection : public smtk::enable_shared_from_this<Collecti
//to different mesh interfaces
Collection(const smtk::common::UUID& collectionID, smtk::mesh::InterfacePtr interface,
smtk::mesh::ManagerPtr mngr);
#endif
public:
smtkTypeMacro(Collection);
......@@ -308,7 +306,6 @@ public:
const smtk::mesh::MeshSet& meshset, const std::string& propName);
bool hasIntegerProperty(const smtk::mesh::MeshSet& meshset, const std::string& propName) const;
bool removeIntegerProperty(const smtk::mesh::MeshSet& meshset, const std::string& propName);
#ifndef SHIBOKEN_SKIP
// For T = {MeshIntegerData, MeshFloatData, MeshStringData}:
template <typename T>
T* properties();
......@@ -317,7 +314,6 @@ public:
T* meshProperties(const smtk::mesh::MeshSet& meshset);
template <typename T>
bool removeProperty(const smtk::mesh::MeshSet& meshset, const std::string& name);
#endif // SHIBOKEN_SKIP
private:
Collection(const Collection& other); //blank since we are used by shared_ptr
......
......@@ -73,7 +73,6 @@ private:
//Don't wrap these for python, instead python should use the MeshConstants class and
//the extract method
#ifndef SHIBOKEN_SKIP
SMTKCORE_EXPORT void extractDirichletMeshConstants(
const smtk::mesh::MeshSet&, PreAllocatedMeshConstants&);
......@@ -95,8 +94,6 @@ SMTKCORE_EXPORT void extractDomainMeshConstants(
template <typename QueryTag>
SMTKCORE_EXPORT void extractMeshConstants(
const smtk::mesh::MeshSet&, const smtk::mesh::PointSet&, PreAllocatedMeshConstants&);
#endif //SHIBOKEN_SKIP
}
}
......
......@@ -144,7 +144,6 @@ private:
//Don't wrap these for python, instead python should use the Tessellation class
//and the extract method
#ifndef SHIBOKEN_SKIP
SMTKCORE_EXPORT void extractTessellation(const smtk::mesh::MeshSet&, PreAllocatedTessellation&);
SMTKCORE_EXPORT void extractTessellation(const smtk::mesh::CellSet&, PreAllocatedTessellation&);
......@@ -170,8 +169,6 @@ SMTKCORE_EXPORT void extractOrderedTessellation(const smtk::model::EdgeUse&,
const smtk::mesh::CollectionPtr&, const smtk::mesh::PointSet&, PreAllocatedTessellation&);
SMTKCORE_EXPORT void extractOrderedTessellation(const smtk::model::Loop&,
const smtk::mesh::CollectionPtr&, const smtk::mesh::PointSet&, PreAllocatedTessellation&);
#endif //SHIBOKEN_SKIP
}
}
......
......@@ -16,9 +16,7 @@
#include "smtk/CoreExports.h"
#include "smtk/mesh/moab/HandleRange.h"
#ifndef SHIBOKEN_SKIP
#include "cJSON.h"
#endif // SHIBOKEN_SKIP
namespace smtk
{
......
......@@ -44,7 +44,6 @@ public:
//this manager
smtk::mesh::CollectionPtr makeCollection(const smtk::common::UUID& collectionID);
#ifndef SHIBOKEN_SKIP
//Construct a collection. Manager will generate the UUID, and use