Changeset 189f83 in git

Timestamp:

May 10, 2011, 6:02:18 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

c262d553ef66afc97649f98c489e0eeff937603d

Parents:

2db7aeea84caf5f3621e15f997e41de267126db7

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-05-10 18:02:18+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:34:44+01:00

Message:

FIX: C++ headers have no ".h"
FIX: atoi/abort are from the C header "stdlib.h"
FIX: initializeGMP is needed for any program which uses libfactory

File:

• factory/gengftables-conway.cc (modified) (6 diffs)

factory/gengftables-conway.cc

@@ -11 +11 @@
 //}}}
 
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <strstream>
 #include <string>
 
+#include <stdlib.h>
+
 #include <factory.h>
 
@@ -22 +24 @@
 
 using namespace std;
+
+int initializeGMP()
+{
+  return 1;
+}
+
 
 //{{{ constants
@@ -298 +306 @@
                 ps = LineSe.substr(0, pos1);
                 ns = LineSe.substr(pos1 + 1,pos2 - pos1);
-                ptmp = std::atoi(ps.c_str());                //we have the value of p and n of these line
-                ntmp = std::atoi(ns.c_str());
+                ptmp = atoi(ps.c_str());                //we have the value of p and n of these line
+                ntmp = atoi(ns.c_str());
 
         if((ntmp==n)&&(ptmp==p)){flag=0;}        // we check if they are our p and n to stop the search
@@ -314 +322 @@
         pos1 = pos2 + 1;
         pos2 = LineSe.find(",", pos1 + 1);
-        conway = std::atoi(LineSe.substr(pos1, pos2 - pos1).c_str()); // value of the constant term in PC=Conway Polynomial
+        conway = atoi(LineSe.substr(pos1, pos2 - pos1).c_str()); // value of the constant term in PC=Conway Polynomial
     pos1 = pos2;
         pos2 = LineSe.find(",", pos1 + 1);
@@ -323 +331 @@
         if(coef != "0")
                 {
-                        conway = conway + std::atoi(coef.c_str()) * power(x, ii - 1) ; //We add this monomial to the Conway Polynomial
+                        conway = conway + atoi(coef.c_str()) * power(x, ii - 1) ; //We add this monomial to the Conway Polynomial
                 }
                 pos1 = pos2;
@@ -331 +339 @@
         pos2 = LineSe.find( ",END", pos1 + 1); // To obtain the last coefficient we search "END" instead of ","
         coef = LineSe.substr(pos1 + 1,pos2 - pos1 - 1);
-        conway = conway + std::atoi(coef.c_str()) * power(x, ii - 1) ; //We add the last monomial to the Conway Polynomial
+        conway = conway + atoi(coef.c_str()) * power(x, ii - 1) ; //We add the last monomial to the Conway Polynomial
 
         in.close();