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.

Sign up for GitHub

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

Fix Visual Studio 2015 build errors #580

Merged
merged 5 commits into from
Jan 8, 2016
Merged

Fix Visual Studio 2015 build errors #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b0f4ee7
Allow CMake to generate for VS 2015.
donnyward Jan 2, 2016
8d23ecd
Include <iostream> to define std::cout.
donnyward Jan 2, 2016
7318372
Forward declare structs as structs, not classes.
donnyward Jan 2, 2016
bec9a8d
Resolve Visual Studio error C4800.
donnyward Jan 2, 2016
c68f92b
Merge branch 'master' into vs2015_fixes
donnyward Jan 8, 2016
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ endif()
#===============================================================================
if(MSVC)
# Visual Studio enables c++11 support by default
if(NOT MSVC12)
if(NOT MSVC12 AND NOT MSVC14)
message(FATAL_ERROR "${PROJECT_NAME} requires VS 2013 or greater.")
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP4")
Expand Down
2 changes: 1 addition & 1 deletion dart/constraint/ConstrainedGroup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class Skeleton;

namespace constraint {

class ConstraintInfo;
struct ConstraintInfo;
class ConstraintBase;
class ConstraintSolver;

Expand Down
2 changes: 1 addition & 1 deletion dart/dynamics/Skeleton.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ class Skeleton : public MetaSkeleton
friend class EndEffector;

protected:
class DataCache;
struct DataCache;

/// Constructor called by create()
Skeleton(const Properties& _properties);
Expand Down
2 changes: 1 addition & 1 deletion dart/math/Helpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ inline bool isInt(double _x) {
/// \brief Returns whether _v is a NaN (Not-A-Number) value
inline bool isNan(double _v) {
#ifdef _WIN32
return _isnan(_v);
return _isnan(_v) != 0;
#else
return std::isnan(_v);
#endif
Expand Down
1 change: 1 addition & 0 deletions dart/utils/urdf/urdf_world_parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#include <fstream>
#include <sstream>
#include <algorithm>
#include <iostream>

#include <tinyxml.h>

Expand Down