Skip to content

VisualStudio build fixes #538

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

Merged
merged 3 commits into from
Feb 14, 2017
Merged

VisualStudio build fixes #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46c2380
Add missing <string> header for std::to_string
tautschnig Feb 13, 2017
b2e5c0d
Work around VS2013's lack of constexpr support
tautschnig Feb 13, 2017
50f7eb1
Include <algorithm> to provide std::max
tautschnig Feb 13, 2017
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
7 changes: 7 additions & 0 deletions src/goto-programs/goto_program_template.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,15 @@ class goto_program_templatet
}

//! Uniquely identify an invalid target or location
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"...unless we are on old MS compiler"
(?)

#if (defined _MSC_VER && _MSC_VER <= 1800)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add an explanation for 1800 and the variable name? Something like "_MSC_VER is a version of the Microsoft 'cl' compiler, 1800 corresponds to the Visual Studio 2013 version"

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me know whether you're happy with one that I have just pushed!

// Visual Studio <= 2013 does not support constexpr, making
// numeric_limits::max() unviable for a static const member
static const unsigned nil_target=
static_cast<unsigned>(-1);
#else
static const unsigned nil_target=
std::numeric_limits<unsigned>::max();
#endif

//! A globally unique number to identify a program location.
//! It's guaranteed to be ordered in program order within
Expand Down
2 changes: 2 additions & 0 deletions src/goto-programs/remove_static_init_loops.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ Author: Daniel Kroening, [email protected]

\*******************************************************************/

#include <algorithm>

#include <util/message.h>
#include <util/suffix.h>
#include <util/string2int.h>
Expand Down
2 changes: 1 addition & 1 deletion src/solvers/prop/aig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Author: Daniel Kroening, [email protected]

#include <cassert>
#include <ostream>

#include <string>

#include "aig.h"

Expand Down