Attachment #435722 for bug #582694

View | Details | Raw Unified | Return to bug 582694
Collapse All | Expand All

Lines 18537-18542 Link Here

(-)source-highlight-3.1.7/configure.old (+2 lines)
18537	/* end confdefs.h. */	18537	/* end confdefs.h. */
18538		18538
18539	#include <stdbool.h>	18539	#include <stdbool.h>
		18540	#if ! defined __cplusplus \|\| __cplusplus < 201103L
18540	#ifndef bool	18541	#ifndef bool
18541	"error: bool is not defined"	18542	"error: bool is not defined"
18542	#endif	18543	#endif
Lines 18552-18557 Link Here
18552	#if true != 1	18553	#if true != 1
18553	"error: true is not 1"	18554	"error: true is not 1"
18554	#endif	18555	#endif
		18556	#endif
18555	#ifndef __bool_true_false_are_defined	18557	#ifndef __bool_true_false_are_defined
18556	"error: __bool_true_false_are_defined is not defined"	18558	"error: __bool_true_false_are_defined is not defined"
18557	#endif	18559	#endif

Lines 43-48 Link Here

(-)source-highlight-3.1.7/gl/m4/stdbool.m4.old (+2 lines)
43	[AC_LANG_PROGRAM(	43	[AC_LANG_PROGRAM(
44	[[	44	[[
45	#include <stdbool.h>	45	#include <stdbool.h>
		46	#if ! defined __cplusplus \|\| __cplusplus < 201103L
46	#ifndef bool	47	#ifndef bool
47	"error: bool is not defined"	48	"error: bool is not defined"
48	#endif	49	#endif
Lines 58-63 Link Here
58	#if true != 1	59	#if true != 1
59	"error: true is not 1"	60	"error: true is not 1"
60	#endif	61	#endif
		62	#endif
61	#ifndef __bool_true_false_are_defined	63	#ifndef __bool_true_false_are_defined
62	"error: __bool_true_false_are_defined is not defined"	64	"error: __bool_true_false_are_defined is not defined"
63	#endif	65	#endif




    string file = dataDir + "/" + testFileName;
    ifstream i(file.c_str());

    return ((bool)i);
}

bool Settings::checkForConfFile() {
    string file = confDir + confFileName;
    ifstream i(file.c_str());

    return ((bool)i);
}

bool Settings::readDataDir() {

    ifstream i(file.c_str());

    string line;
    if (i) {
        while (read_line(&i, line)) {
            if (line.size()) {
                boost::cmatch what;

Return to bug 582694

Lines 94-107 Link Here

(-)source-highlight-3.1.7/lib/srchilite/settings.cpp.old (-3 / +3 lines)
94	string file = dataDir + "/" + testFileName;	94	string file = dataDir + "/" + testFileName;
95	ifstream i(file.c_str());	95	ifstream i(file.c_str());
96		96
97	return (i != 0);	97	return ((bool)i);
98	}	98	}
99		99
100	bool Settings::checkForConfFile() {	100	bool Settings::checkForConfFile() {
101	string file = confDir + confFileName;	101	string file = confDir + confFileName;
102	ifstream i(file.c_str());	102	ifstream i(file.c_str());
103		103
104	return (i != 0);	104	return ((bool)i);
105	}	105	}
106		106
107	bool Settings::readDataDir() {	107	bool Settings::readDataDir() {
Lines 109-115 Link Here
109	ifstream i(file.c_str());	109	ifstream i(file.c_str());
110		110
111	string line;	111	string line;
112	if (i != 0) {	112	if (i) {
113	while (read_line(&i, line)) {	113	while (read_line(&i, line)) {
114	if (line.size()) {	114	if (line.size()) {
115	boost::cmatch what;	115	boost::cmatch what;