Commit c5eb124b authored by Matthias Rungger's avatar Matthias Rungger
Browse files

Fix some compatibility issues with g++

parent d0de6146
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <sstream> #include <sstream>
#include <vector> #include <vector>
#include <cassert> #include <cassert>
#include <bitset>
#include "cuddObj.hh" #include "cuddObj.hh"
/* class: CuddMintermIterator /* class: CuddMintermIterator
...@@ -58,7 +59,7 @@ class CuddMintermIterator { ...@@ -58,7 +59,7 @@ class CuddMintermIterator {
done_=false; done_=false;
counter_=0; counter_=0;
if(nvars_>(sizeof(size_t)*CHAR_BIT)) { if(nvars_>(sizeof(size_t))) {
std::ostringstream os; std::ostringstream os;
os << "Error: CuddMintermIterator: number of variables we iterate over is limited to highest number in size_t."; os << "Error: CuddMintermIterator: number of variables we iterate over is limited to highest number in size_t.";
throw std::invalid_argument(os.str().c_str()); throw std::invalid_argument(os.str().c_str());
...@@ -132,7 +133,7 @@ class CuddMintermIterator { ...@@ -132,7 +133,7 @@ class CuddMintermIterator {
std::cout<<std::endl; std::cout<<std::endl;
/* number of variables we iterate over is limited to highest number in size_t */ /* number of variables we iterate over is limited to highest number in size_t */
if(nvars_>(sizeof(size_t)*CHAR_BIT)) { if(nvars_>(sizeof(size_t))) {
std::ostringstream os; std::ostringstream os;
os << "Error: CuddMintermIterator: number of variables we iterate over is limited to highest number in size_t."; os << "Error: CuddMintermIterator: number of variables we iterate over is limited to highest number in size_t.";
throw std::invalid_argument(os.str().c_str()); throw std::invalid_argument(os.str().c_str());
...@@ -181,7 +182,7 @@ class CuddMintermIterator { ...@@ -181,7 +182,7 @@ class CuddMintermIterator {
} }
inline void operator++(void) { inline void operator++(void) {
const size_t MVAR = sizeof(size_t)*CHAR_BIT; const size_t MVAR = sizeof(size_t);
iterator++; iterator++;
progress++; progress++;
/* get new cube or expand cube further */ /* get new cube or expand cube further */
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#define SYMBOLICSET_HH_ #define SYMBOLICSET_HH_
#include <vector> #include <vector>
#include <algorithm>
#include <sstream> #include <sstream>
#include <cassert> #include <cassert>
#include <cmath> #include <cmath>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment