Changeset 9f39e6 in git

Timestamp:

Feb 1, 2012, 6:35:13 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

b6b61689e26a509292ac79af82cef26348104668

Parents:

72486f0639537653ca068a90c827262845f27ce2

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-01 18:35:13+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-03 18:41:14+01:00

Message:

misc changes

FIX: factory internal includes (better no "factory/" prefix!)
FIX: IntegerProgramming/gen_test.cc: due to C++-Standard main should return an int

Files:

• IntegerProgramming/gen_test.cc (modified) (2 diffs)
• factory/libfac/factor/tmpl_inst.cc (modified) (1 diff)

IntegerProgramming/gen_test.cc

@@ -9 +9 @@
 #include "testdata.h"
 
-main()
+int main(void)
 {
   ofstream output1("IP/testmatrix1");
@@ -65 +65 @@
   ofstream output6c("IP/testproblem6c");
   random_problems(3*5,5,0,5,output6c);
+  return 0;
 }
 #endif

factory/libfac/factor/tmpl_inst.cc

@@ -6 +6 @@
 // #include <factory/templates/ftmpl_array.cc>
 
-#include <factory/factory.h>
+#include "factory.h"
 
-
-
-#include <factory/templates/ftmpl_array.cc>
-#include <factory/templates/ftmpl_factor.cc>
-#include <factory/templates/ftmpl_list.cc>
-#include <factory/templates/ftmpl_functions.h>
-#include <factory/templates/ftmpl_matrix.cc>
+#include "templates/ftmpl_array.cc"
+#include "templates/ftmpl_factor.cc"
+#include "templates/ftmpl_list.cc"
+#include "templates/ftmpl_functions.h"
+#include "templates/ftmpl_matrix.cc"
 
 template class Factor<CanonicalForm>;