Using the new mbk ...

alliance/src/ocp/src/common/PCommon.h

@@ -1,11 +1,9 @@
 #ifndef __PCOMMON_H
 #define __PCOMMON_H
 #include <iostream>
-extern "C"{
 #include "mut.h"
 #include "mlo.h"
 #include "mph.h"
-}
 using namespace std;
 
 const double SquareShape(const double margin, const double sumwidth,

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

@@ -3,11 +3,9 @@
 #include <iostream>
 #include <ctype.h>
 
-extern "C" {
 #include "mut.h"
 #include "mph.h"
 #include "mlo.h"
-}
 using namespace std;
 
 static void

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

@@ -1,8 +1,6 @@
 #include "PCon.h"
-extern "C"{
 #include "mut.h"
 #include "mph.h"
-}
 #include "PConstants.h"
 
 PCon::PCon(const locon* con):

alliance/src/ocp/src/placer/PCon.h

@@ -2,10 +2,8 @@
 #define __PCON_H
 
 #include "PElem.h"
-extern "C" {
 #include "mut.h"
 #include "mlo.h"
-}
 
 class PCon: public PElem {
   private:

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

@@ -1,8 +1,6 @@
 #include "PDetToPlaceIns.h"
-extern "C"{
 #include "mut.h"
 #include "mph.h"
-}
 #include "PConstants.h"
 #include "PToPlaceIns.h"
 #include "PDetSubRow.h"

alliance/src/ocp/src/placer/PFixedIns.h

@@ -3,10 +3,8 @@
 
 #include "PIns.h"
 #include "PPos.h"
-extern "C"{
 #include "mut.h"
 #include "mph.h"
-}
 
 class PFixedIns : public PIns {
     

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

@@ -1,8 +1,6 @@
 #include "PIns.h"
-extern "C"{
 #include "mut.h"
 #include "mph.h"
-}
 #include "PConstants.h"
 
 PIns::PIns(const loins *instance):

alliance/src/ocp/src/placer/PIns.h

@@ -3,10 +3,8 @@
 
 #include "PElem.h"
 #include "PBBox.h"
-extern "C" {
 #include "mut.h"
 #include "mlo.h"
-}
 
 class PIns: public PElem {
     

alliance/src/ocp/src/placer/PNet.h

@@ -4,10 +4,8 @@
 #include <iostream>
 #include <fstream>
 #include <vector>
-extern "C" {
 #include "mut.h"
 #include "mlo.h"
-}
 using namespace std;
 
 class PElem;

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

@@ -3,13 +3,11 @@
 #include <set>
 #include <algorithm>
 #include <string>
-extern "C"{
 #include "mut.h"
 #include "mph.h"
 #include "mpu.h"
 #include "mlo.h"
 #include "mlu.h"
-}
 #include "PMove.h"
 #include "PConstants.h"
 #include "PCommon.h"

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

@@ -12,10 +12,8 @@
 #include "PONet.h"
 #include "PBBox.h"
 #include "PDetSubRow.h"
-extern "C" {
 #include "mut.h"
 #include "mlo.h"
-}
 #include "iocheader.h"
 using namespace std;
 

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

@@ -6,13 +6,11 @@
 #include "PMove.h"
 #include "PConstants.h"
 #include "PDetPlacement.h"
-extern "C"{
 #include "mut.h"
 #include "mph.h"
 #include "mpu.h"
 #include "mlo.h"
 #include "mlu.h"
-}
 
 double
 PPlacement::DetPlaceDebugNetCost()

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

@@ -1,8 +1,6 @@
 #include "PToPlaceIns.h"
-extern "C"{
 #include "mut.h"
 #include "mph.h"
-}
 #include "PConstants.h"
 
 PToPlaceIns::PToPlaceIns(const loins *instance):