remove unnecessary ifdef guards

diff --git a/lib/vpsc/block.cpp b/lib/vpsc/block.cpp
index 9e05bcd4e3d3efcae9cce6df7c3b19be84b6827b..a65f330c8aeaf99d0fd9ec8e01a0cb492a212a40 100644 (file)
--- a/lib/vpsc/block.cpp
+++ b/lib/vpsc/block.cpp
@@ -21,12 +21,10 @@
 #include <vpsc/constraint.h>
 #include <vpsc/block.h>
 #include <vpsc/blocks.h>
-#ifdef RECTANGLE_OVERLAP_LOGGING
 #include <fstream>
 using std::ios;
 using std::ofstream;
 using std::endl;
-#endif
 using std::vector;
 
 typedef vector<Constraint*>::iterator Cit;

diff --git a/lib/vpsc/blocks.cpp b/lib/vpsc/blocks.cpp
index 2ef961df29d568a64852c13087b30a27bced50c4..61fac98d91b6adea43322ed74e0773ff3772e239 100644 (file)
--- a/lib/vpsc/blocks.cpp
+++ b/lib/vpsc/blocks.cpp
@@ -22,12 +22,10 @@
 #include <vpsc/blocks.h>
 #include <vpsc/block.h>
 #include <vpsc/constraint.h>
-#ifdef RECTANGLE_OVERLAP_LOGGING
 #include <fstream>
 using std::ios;
 using std::ofstream;
 using std::endl;
-#endif
 using std::set;
 using std::vector;
 using std::iterator;

diff --git a/lib/vpsc/remove_rectangle_overlap.cpp b/lib/vpsc/remove_rectangle_overlap.cpp
index 11619808c7589fc9f00bdaad3ad83b9af1a3e4b8..107a91de905cf186239388bca75f477da40cecd1 100644 (file)
--- a/lib/vpsc/remove_rectangle_overlap.cpp
+++ b/lib/vpsc/remove_rectangle_overlap.cpp
@@ -21,13 +21,11 @@
 #include <vpsc/solve_VPSC.h>
 #include <vpsc/variable.h>
 #include <vpsc/constraint.h>
-#ifdef RECTANGLE_OVERLAP_LOGGING
 #include <fstream>
 #include <vpsc/blocks.h>
 using std::ios;
 using std::ofstream;
 using std::endl;
-#endif
 
 #define EXTRA_GAP 0.0001
 

diff --git a/lib/vpsc/solve_VPSC.cpp b/lib/vpsc/solve_VPSC.cpp
index d6ce3acf4bfd41f01b5b811aa89191c77ecb5b1f..2ea9720adebd6465a40f0543b57cbff41416aa6f 100644 (file)
--- a/lib/vpsc/solve_VPSC.cpp
+++ b/lib/vpsc/solve_VPSC.cpp
@@ -23,12 +23,10 @@
 #include <vpsc/solve_VPSC.h>
 #include <math.h>
 #include <sstream>
-#ifdef RECTANGLE_OVERLAP_LOGGING
 #include <fstream>
 using std::ios;
 using std::ofstream;
 using std::endl;
-#endif
 
 using std::ostringstream;
 using std::list;