Merge branch 'master' into wp8
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
#ifndef WRESOURCE_FWD_H
|
||||
#define WRESOURCE_FWD_H
|
||||
|
||||
#if !defined(WP8) && !(defined(SDL_CONFIG) && defined(__MINGW32__))
|
||||
#include <boost/shared_ptr.hpp>
|
||||
typedef boost::shared_ptr<JQuad> JQuadPtr;
|
||||
#else
|
||||
#include <memory>
|
||||
typedef std::shared_ptr<JQuad> JQuadPtr;
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#ifndef WRESOURCE_FWD_H
|
||||
#define WRESOURCE_FWD_H
|
||||
|
||||
#if (_MSC_VER >= 1700) || (__cplusplus > 199711L)
|
||||
#include <memory>
|
||||
typedef std::shared_ptr<JQuad> JQuadPtr;
|
||||
#else
|
||||
#include <boost/shared_ptr.hpp>
|
||||
typedef boost::shared_ptr<JQuad> JQuadPtr;
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user