Skip to content
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.

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

uses signals2 #103

Merged
merged 1 commit into from
Jun 19, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions hrplib/hrpModel/ModelNodeSet.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@

#include <vector>
#include <boost/shared_ptr.hpp>
#include <boost/version.hpp>
#if (BOOST_VERSION >= 103900)
#include <boost/signals2/signal.hpp>
#else
#include <boost/signals.hpp>
#endif
#include <hrpUtil/VrmlNodes.h>
#include <hrpUtil/Eigen4d.h>
#include "Config.h"
Expand Down Expand Up @@ -68,7 +73,11 @@ namespace hrp {
@note エラー発生時のメッセージはこのシグナルではなく例外によって処理される。
@endif
*/
#if (BOOST_VERSION >= 103900)
boost::signals2::signal<void(const std::string& message)> sigMessage;
#else
boost::signal<void(const std::string& message)> sigMessage;
#endif

class Exception {
public:
Expand Down
9 changes: 9 additions & 0 deletions hrplib/hrpUtil/TriangleMeshShaper.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@
#include "config.h"
#include "VrmlNodes.h"
#include <string>
#include <boost/version.hpp>
#if (BOOST_VERSION >= 103900)
#include <boost/signals2/signal.hpp>
#else
#include <boost/signal.hpp>
#endif

namespace hrp
{
Expand All @@ -36,7 +41,11 @@ namespace hrp
SFNode getOriginalGeometry(VrmlShapePtr shapeNode);
void defaultTextureMapping(VrmlShape* shapeNode);

#if (BOOST_VERSION >= 103900)
boost::signals2::signal<void(const std::string& message)> sigMessage;
#else
boost::signal<void(const std::string& message)> sigMessage;
#endif

bool convertBox(VrmlBox* box, VrmlIndexedFaceSetPtr& triangleMesh);

Expand Down