casa-mp-base

--- ce/ce.C.orig    2014-03-13 11:50:40.000000000 -0500

+++ ce/ce.C 2014-03-13 11:52:06.000000000 -0500

@@ -47,7 +47,7 @@

 };

 double vecDist(XYZ *o1, XYZ *e1, XYZ *o2, XYZ *e2);

 ////////////////////////////////////////////////////////////////////

-main(int argc, char **argv) {

+int main(int argc, char **argv) {

   if(argc<2) exit(0);

   CE ce;

@@ -79,7 +79,7 @@

   char *user_file1, *entity_id1;

   setText(&user_file1, pdb_file1);

-  setText(&mkdb_command, "pom/mkDB");

+  setText(&mkdb_command, "mkDB");

   addText(&mkdb_command, " scratch ");

   addText(&mkdb_command, db_tmp_path);

   addText(&mkdb_command, " ");

@@ -96,7 +96,7 @@

   setText(&user_file2, pdb_file2);

-  setText(&mkdb_command, "pom/mkDB");

+  setText(&mkdb_command, "mkDB");

   addText(&mkdb_command, " scratch ");

   addText(&mkdb_command, db_tmp_path);

   addText(&mkdb_command, " ");

--- pom/ipdb.C.orig 2014-03-13 11:50:14.000000000 -0500

+++ pom/ipdb.C  2014-03-13 11:52:06.000000000 -0500

@@ -2947,7 +2947,7 @@

 //////////////////////////////////////////////////////////////////

 //////////////////////////////////////////////////////////////////

 int main(int, char**, char **env=NULL);

-main(int argc, char **argv, char **env)

+int main(int argc, char **argv, char **env)

 {

   Tlpdb tlpdb;

--- pom/calc.C.orig 2014-03-13 11:50:30.000000000 -0500

+++ pom/calc.C  2014-03-13 11:52:06.000000000 -0500

@@ -1,5 +1,5 @@

 #include <math.h>

-#include <iostream.h>

+#include <iostream>

 #include "contour.h"

 #include "calc.h"

--- pom/pom.h.orig  2000-05-25 16:38:55.000000000 -0500

+++ pom/pom.h   2010-01-07 12:04:24.000000000 -0600

@@ -410,11 +410,11 @@

 };

 ////////////////////////////////////////////////////////////////////

 class Entities {

-  friend IEntity;

-  friend ISubentity;

-  friend IAtom;

-  friend IMonomer;

-  friend IBond;

+  friend class IEntity;

+  friend class ISubentity;

+  friend class IAtom;