Changeset 311803 in git


Ignore:
Timestamp:
Aug 24, 2011, 12:01:52 AM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')
Children:
06aafe1435abc46caaf98845d6df8e3da8ade1f1
Parents:
72ebdb01e4821ac45cbf1e8065cb15515ef1b391
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-24 00:01:52+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:26+01:00
Message:
FIX: readcf.{yy->cc} fixed disabling (for Singular or without IOSTREAM)
Location:
factory
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • factory/Makefile.am

    r72ebdb r311803  
    246246        ${srcdir}/bin/makeheader $< $@
    247247
    248 BUILT_SOURCES = cplusplus.h factory.h factoryconf.h
     248BUILT_SOURCES = cplusplus.h factory.h factoryconf.h readcf.cc
    249249
    250250
    … …  
    307307                examples/factorize.cc examples/gcd.cc \
    308308                bin/folding.el bin/fold-docu.el \
    309                 bin/makeheader bin/gen-readcf readcf.cc $(gftables_DATA)
    310 
    311 CLEANFILES = factory.h factoryconf.h cplusplus.h
     309                bin/makeheader bin/gen-readcf $(gftables_DATA)
     310
     311CLEANFILES = factory.h factoryconf.h cplusplus.h readcf.cc
    312312
    313313

  • factory/factory.template

    r72ebdb r311803  
    2222//}}}
    2323
    24 // #include <factory/factoryconf.h>
     24#include <factory/factoryconf.h>
    2525
    2626#ifndef NOSTREAMIO

  • factory/readcf.yy

    r72ebdb r311803  
    33
    44%{
    5 #ifndef NOSTREAMIO
     5
     6#include "config.h"
     7#include "factoryconf.h"
     8
     9#if (!defined(NOSTREAMIO)) && (!defined(SINGULAR))
     10
    611
    712#if defined(WINNT) && ! defined(__GNUC__)
    8 #include <malloc.h>
    9 #include <memory.h>
    10 #define alloca _alloca
     13# include <malloc.h>
     14# include <memory.h>
     15# define alloca _alloca
    1116#endif
    1217
    … …  
    1520
    1621#include <ctype.h>
     22
    1723#ifdef HAVE_IOSTREAM
    18 #include <iostream>
    19 #define ISTREAM std::istream
    20 #define CERR std::cerr
     24# include <iostream>
     25# define ISTREAM std::istream
     26# define CERR std::cerr
    2127#elif defined(HAVE_IOSTREAM_H)
    22 #include <iostream.h>
    23 #define ISTREAM istream
    24 #define CERR cerr
     28# include <iostream.h>
     29# define ISTREAM istream
     30# define CERR cerr
    2531#endif
    2632
    … …  
    3541
    3642#ifndef BISONPP
    37 #define YYSTYPE ParseUtil
    38 #else
    39 #define YY_parse_USE_GOTO 1
    40 #define YY_parse_STYPE ParseUtil
     43# define YYSTYPE ParseUtil
     44#else
     45# define YY_parse_USE_GOTO 1
     46# define YY_parse_STYPE ParseUtil
    4147#endif
    4248
    … …  
    213219
    214220
    215 #endif
    216 // #ifndef NOSTREAMIO
     221#endif 
     222/* #ifndef SINGULAR && ifndef NOSTREAMIO */
Note: See TracChangeset for help on using the changeset viewer.