hash_map for ggc 2.96, 3.0, 3.1 ....

alliance/src/ocp/src/common/PCommon.cpp

@@ -1,5 +1,5 @@
 #include "PCommon.h"
-#include <iostream.h>
+#include <iostream>
 #include <math.h>
 #include <string>
 #include <assert.h>

alliance/src/ocp/src/placer/Ocp.cpp

@@ -1,12 +1,13 @@
-#include "PPlacement.h"
 #include <stdio.h>
 #include <iostream>
 #include <ctype.h>
+using namespace std;
 
 #include "mut.h"
 #include "mph.h"
 #include "mlo.h"
-using namespace std;
+
+#include "PPlacement.h"
 
 static void
 Usage()

alliance/src/ocp/src/placer/PBin.cpp

@@ -1,8 +1,11 @@
-#include "PBin.h"
 #include <stdio.h>
 #include <iomanip>
+using namespace std;
+
 #include "PToPlaceIns.h"
 
+#include "PBin.h"
+
 PBin::PBin()
     : PContainer(), _toPlaceInss(), _nHits(0)
 {

alliance/src/ocp/src/placer/PCon.cpp

@@ -1,8 +1,10 @@
-#include "PCon.h"
 #include "mut.h"
 #include "mph.h"
+
 #include "PConstants.h"
 
+#include "PCon.h"
+
 PCon::PCon(const locon* con):
 		PElem(), _con(con), _pos()
 {}

alliance/src/ocp/src/placer/PDetPlacement.cpp

@@ -1,7 +1,8 @@
-#include "PDetPlacement.h"
 #include "PBin.h"
 #include "PPlacement.h"
 
+#include "PDetPlacement.h"
+
 PDetPlacement::PDetPlacement(Problem& problem):
 	BBoxFlag(0),
 	_costFlag(0),

alliance/src/ocp/src/placer/PDetSubRow.cpp

@@ -1,8 +1,11 @@
-#include "PDetSubRow.h"
+#include <algorithm>
+using namespace std;
+
 #include "PSubRow.h"
 #include "PBin.h"
 #include "PDetPlacement.h"
-#include <algorithm>
+
+#include "PDetSubRow.h"
 
 PDetSubRow::~PDetSubRow()
 {

alliance/src/ocp/src/placer/PDetToPlaceIns.cpp

@@ -1,11 +1,15 @@
-#include "PDetToPlaceIns.h"
+#include <algorithm>
+using namespace std;
+
 #include "mut.h"
 #include "mph.h"
+
 #include "PConstants.h"
 #include "PToPlaceIns.h"
 #include "PDetSubRow.h"
 #include "PONet.h"
-#include <algorithm>
+
+#include "PDetToPlaceIns.h"
 
 PDetToPlaceIns::PDetToPlaceIns(PToPlaceIns* toplaceins):
 	PIns(toplaceins->GetInstance()),

alliance/src/ocp/src/placer/PElem.cpp

@@ -1,6 +1,7 @@
-#include "PElem.h"
 #include "PNet.h"
 
+#include "PElem.h"
+
 void
 PElem::DescribeOn(ostream& os) const
 {

alliance/src/ocp/src/placer/PFixedIns.cpp

@@ -1,6 +1,7 @@
-#include "PFixedIns.h"
 #include "PConstants.h"
 
+#include "PFixedIns.h"
+
 PFixedIns::PFixedIns(const loins *instance, const phins* pins, int dx, int dy):
 		PIns(instance),
 		_pins(pins),

alliance/src/ocp/src/placer/PIns.cpp

@@ -1,8 +1,10 @@
-#include "PIns.h"
 #include "mut.h"
 #include "mph.h"
+
 #include "PConstants.h"
 
+#include "PIns.h"
+
 PIns::PIns(const loins *instance):
 PElem(), _instance(instance)
 {

alliance/src/ocp/src/placer/PMove.cpp

@@ -1,7 +1,10 @@
-#include "PMove.h"
 #include <stdlib.h>
 #include <limits.h>
-#include <PBin.h>
+using namespace std;
+
+#include "PBin.h"
+
+#include "PMove.h"
 
 #ifndef Abs
 #define Abs(x) ((x) < 0.0 ? -(x) : (x))

alliance/src/ocp/src/placer/PNet.cpp

@@ -1,6 +1,7 @@
-#include "PNet.h"
 #include "PElem.h"
 
+#include "PNet.h"
+
 PNet::PNet(const losig* sig):
 	_sig(sig), _elems()
 {}

alliance/src/ocp/src/placer/PONet.cpp

@@ -1,6 +1,7 @@
-#include "PONet.h"
 #include "PDetToPlaceIns.h"
 
+#include "PONet.h"
+
 PONet::PONet(const losig* sig):
 	PNet(sig),
 	_bBoxMark(0), _currCostMark(0),

alliance/src/ocp/src/placer/PPlacement.cpp

@@ -1,18 +1,20 @@
-#include "PPlacement.h"
 #include <unistd.h>
 #include <set>
 #include <algorithm>
 #include <string>
+using namespace std;
+
 #include "mut.h"
 #include "mph.h"
 #include "mpu.h"
 #include "mlo.h"
 #include "mlu.h"
+
+#include "iocheader.h"
 #include "PMove.h"
 #include "PConstants.h"
 #include "PCommon.h"
-#include "iocheader.h"
+#include "PPlacement.h"
-using namespace std;
 
 struct CompPInsByWidth {
     bool operator()(PIns* Ins1, PIns* Ins2) {

alliance/src/ocp/src/placer/PPlacement.h

@@ -1,21 +1,34 @@
 #ifndef __PPLACEMENT_H
 #define __PPLACEMENT_H
 
+#ifdef __GNUC__
+#if __GNUC__ < 3
+#include <hash_map.h>
+#else
+#include <ext/hash_map>
+#if __GNUC_MINOR__ == 0
+#else
+using namespace __gnu_cxx; // GCC 3.1 and later
+#endif
+#endif
+#endif
+
 #include <iostream>
 #include <fstream>
 #include <vector>
 #include <map>
-#include <hash_map.h>
+using namespace std;
+
+#include "mut.h"
+#include "mlo.h"
+
 #include "PToPlaceIns.h"
 #include "PFixedIns.h"
 #include "PCon.h"
 #include "PONet.h"
 #include "PBBox.h"
 #include "PDetSubRow.h"
-#include "mut.h"
-#include "mlo.h"
 #include "iocheader.h"
-using namespace std;
 
 struct eqstr
 {

alliance/src/ocp/src/placer/PPlacementFinal.cpp

@@ -1,17 +1,32 @@
-#include "PPlacement.h"
+#ifdef __GNUC__
+#if __GNUC__ < 3
+#include <hash_map.h>
+#else
+#include <ext/hash_map>
+#if __GNUC_MINOR__ == 0
+#else
+using namespace __gnu_cxx; // GCC 3.1 and later
+#endif
+#endif
+#endif
+
 #include <math.h>
 #include <unistd.h>
 #include <algorithm>
-#include <hash_map.h>
+using namespace std;
-#include "PMove.h"
+
-#include "PConstants.h"
-#include "PDetPlacement.h"
 #include "mut.h"
 #include "mph.h"
 #include "mpu.h"
 #include "mlo.h"
 #include "mlu.h"
 
+#include "PMove.h"
+#include "PConstants.h"
+#include "PDetPlacement.h"
+
+#include "PPlacement.h"
+
 double
 PPlacement::DetPlaceDebugNetCost()
 {

alliance/src/ocp/src/placer/PPlacementGlobal.cpp

@@ -1,11 +1,13 @@
-#include "PPlacement.h"
 #include <stdio.h>
 #include <math.h>
 #include <unistd.h>
-#include "PMove.h"
+using namespace std;
 
+#include "PMove.h"
 #include "PConstants.h"
 
+#include "PPlacement.h"
+
 static double
 DoubleRand(void)
 {

alliance/src/ocp/src/placer/PRow.cpp

@@ -1,8 +1,9 @@
-#include "PRow.h"
 #include "PPlacement.h"
 #include "PConstants.h"
 #include "PBBox.h"
 
+#include "PRow.h"
+
 PRow::PRow(unsigned nbofsubrows)
     : PContainer(), _subRows(nbofsubrows)
 {

alliance/src/ocp/src/placer/PSubRow.cpp

@@ -1,8 +1,9 @@
-#include "PSubRow.h"
 #include "PBin.h"
 #include "PToPlaceIns.h"
 #include "PConstants.h"
 
+#include "PSubRow.h"
+
 PSubRow::PSubRow()
     : PContainer(), _bins(),
     _binsXMax()

alliance/src/ocp/src/placer/PToPlaceIns.cpp

@@ -1,8 +1,10 @@
-#include "PToPlaceIns.h"
 #include "mut.h"
 #include "mph.h"
+
 #include "PConstants.h"
 
+#include "PToPlaceIns.h"
+
 PToPlaceIns::PToPlaceIns(const loins *instance):
 		PIns(instance),
 		_bin(0)