update to 2.05 (#1166336)

This commit is contained in:
Thomas Spura 2014-11-22 08:48:56 +01:00
parent d1a18d3507
commit 8918a10323
4 changed files with 15 additions and 12 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ astyle_1.24_linux.tar.gz
/astyle_2.02.1_linux.tar.gz
/astyle_2.03_linux.tar.gz
/astyle_2.04_linux.tar.gz
/astyle_2.05_linux.tar.gz

View File

@ -1,23 +1,22 @@
diff -up astyle/src/astyle.h.indent-api astyle/src/astyle.h
--- astyle/src/astyle.h.indent-api 2014-03-20 13:41:48.000000000 +0100
+++ astyle/src/astyle.h 2014-03-20 13:42:55.000000000 +0100
@@ -389,6 +389,10 @@ class ASBeautifier : protected ASResourc
--- astyle/src/astyle.h.orig 2014-11-20 22:57:25.695335483 +0100
+++ astyle/src/astyle.h 2014-11-20 22:58:20.073565069 +0100
@@ -382,6 +382,10 @@
bool getPreprocDefineIndent(void) const;
bool getSwitchIndent(void) const;
+ // set by Code::Blocks IDE
+ // set by Code::Blocks IDE
+ void setBlockIndent(bool state);
+ void setBracketIndent(bool state);
+
protected:
void deleteBeautifierVectors();
const string* findHeader(const string &line, int i,
@@ -397,8 +401,6 @@ class ASBeautifier : protected ASResourc
@@ -390,8 +394,6 @@
const vector<const string*>* possibleOperators) const;
int getNextProgramCharDistance(const string &line, int i) const;
int getNextProgramCharDistance(const string &line, int i) const;
int indexOf(vector<const string*> &container, const string* element) const;
- void setBlockIndent(bool state);
- void setBracketIndent(bool state);
void setBracketIndentVtk(bool state);
string extractPreprocessorStatement(const string &line) const;
string trim(const string &str) const;
string rtrim(const string &str) const;

View File

@ -1,6 +1,6 @@
Name: astyle
Version: 2.04
Release: 5%{?dist}
Version: 2.05
Release: 1%{?dist}
Summary: Source code formatter for C-like programming languages
Group: Development/Tools
@ -70,6 +70,9 @@ popd
%{_includedir}/astyle.h
%changelog
* Thu Nov 20 2014 Thomas Spura <tomspur@fedoraproject.org> - 2.05-1
- update to 2.05 (#1166336)
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.04-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

View File

@ -1 +1 @@
30b1193a758b0909d06e7ee8dd9627f6 astyle_2.04_linux.tar.gz
3806526408bb08db795f0d4d35ef48e5 astyle_2.05_linux.tar.gz