projects
/
external
/
ragel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3f8b16e
)
tizen 2.3.1 release
accepted/tizen_2.4_mobile
tizen_2.3.1
tizen_2.4
accepted/tizen/2.4/mobile/20151029.035437
submit/tizen_2.3.1/20150915.075332
submit/tizen_2.4/20151028.063321
tizen_2.3.1_release
tizen_2.4_mobile_release
author
jk7744.park
<jk7744.park@samsung.com>
Tue, 8 Sep 2015 13:04:54 +0000
(22:04 +0900)
committer
jk7744.park
<jk7744.park@samsung.com>
Tue, 8 Sep 2015 13:04:54 +0000
(22:04 +0900)
aapl/avlcommon.h
patch
|
blob
|
history
aapl/bstcommon.h
patch
|
blob
|
history
aapl/bubblesort.h
patch
|
blob
|
history
aapl/mergesort.h
patch
|
blob
|
history
packaging/ragel.spec
patch
|
blob
|
history
diff --git
a/aapl/avlcommon.h
b/aapl/avlcommon.h
index
06983bc
..
d37f3f4
100644
(file)
--- a/
aapl/avlcommon.h
+++ b/
aapl/avlcommon.h
@@
-881,9
+881,9
@@
template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
}
#ifdef AVL_BASIC
}
#ifdef AVL_BASIC
- keyRelation = compare( *element, *curEl );
+ keyRelation =
Compare::
compare( *element, *curEl );
#else
#else
- keyRelation =
compare( element->BASEKEY(getKey()),
+ keyRelation =
Compare::compare( element->BASEKEY(getKey()),
curEl->BASEKEY(getKey()) );
#endif
curEl->BASEKEY(getKey()) );
#endif
@@
-920,7
+920,7
@@
template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
long keyRelation;
while (curEl) {
long keyRelation;
while (curEl) {
- keyRelation = compare( *element, *curEl );
+ keyRelation =
Compare::
compare( *element, *curEl );
/* Do we go left? */
if ( keyRelation < 0 )
/* Do we go left? */
if ( keyRelation < 0 )
@@
-969,7
+969,7
@@
template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
return element;
}
return element;
}
- keyRelation = compare( key, curEl->BASEKEY(getKey()) );
+ keyRelation =
Compare::
compare( key, curEl->BASEKEY(getKey()) );
/* Do we go left? */
if ( keyRelation < 0 ) {
/* Do we go left? */
if ( keyRelation < 0 ) {
@@
-1023,7
+1023,7
@@
template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
return element;
}
return element;
}
- keyRelation = compare(key, curEl->getKey());
+ keyRelation =
Compare::
compare(key, curEl->getKey());
/* Do we go left? */
if ( keyRelation < 0 ) {
/* Do we go left? */
if ( keyRelation < 0 ) {
@@
-1058,7
+1058,7
@@
template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
long keyRelation;
while (curEl) {
long keyRelation;
while (curEl) {
- keyRelation = compare( key, curEl->BASEKEY(getKey()) );
+ keyRelation =
Compare::
compare( key, curEl->BASEKEY(getKey()) );
/* Do we go left? */
if ( keyRelation < 0 )
/* Do we go left? */
if ( keyRelation < 0 )
diff --git
a/aapl/bstcommon.h
b/aapl/bstcommon.h
index
888717f
..
410e77e
100644
(file)
--- a/
aapl/bstcommon.h
+++ b/
aapl/bstcommon.h
@@
-361,7
+361,7
@@
template <BST_TEMPL_DEF> bool BstTable<BST_TEMPL_USE>::
}
mid = lower + ((upper-lower)>>1);
}
mid = lower + ((upper-lower)>>1);
- keyRelation = compare(key, GET_KEY(*mid));
+ keyRelation =
Compare::
compare(key, GET_KEY(*mid));
if ( keyRelation < 0 )
upper = mid - 1;
if ( keyRelation < 0 )
upper = mid - 1;
@@
-373,12
+373,12
@@
template <BST_TEMPL_DEF> bool BstTable<BST_TEMPL_USE>::
lower = mid - 1;
while ( lower != lowEnd &&
lower = mid - 1;
while ( lower != lowEnd &&
- compare(key, GET_KEY(*lower)) == 0 )
+
Compare::
compare(key, GET_KEY(*lower)) == 0 )
lower--;
upper = mid + 1;
while ( upper != highEnd &&
lower--;
upper = mid + 1;
while ( upper != highEnd &&
- compare(key, GET_KEY(*upper)) == 0 )
+
Compare::
compare(key, GET_KEY(*upper)) == 0 )
upper++;
low = (Element*)lower + 1;
upper++;
low = (Element*)lower + 1;
@@
-419,7
+419,7
@@
template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
}
mid = lower + ((upper-lower)>>1);
}
mid = lower + ((upper-lower)>>1);
- keyRelation = compare(key, GET_KEY(*mid));
+ keyRelation =
Compare::
compare(key, GET_KEY(*mid));
if ( keyRelation < 0 )
upper = mid - 1;
if ( keyRelation < 0 )
upper = mid - 1;
@@
-457,7
+457,7
@@
template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
}
mid = lower + ((upper-lower)>>1);
}
mid = lower + ((upper-lower)>>1);
- keyRelation = compare(key, GET_KEY(*mid));
+ keyRelation =
Compare::
compare(key, GET_KEY(*mid));
if ( keyRelation < 0 )
upper = mid - 1;
if ( keyRelation < 0 )
upper = mid - 1;
@@
-508,7
+508,7
@@
template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
}
mid = lower + ((upper-lower)>>1);
}
mid = lower + ((upper-lower)>>1);
- keyRelation = compare(key, GET_KEY(*mid));
+ keyRelation =
Compare::
compare(key, GET_KEY(*mid));
if ( keyRelation < 0 )
upper = mid - 1;
if ( keyRelation < 0 )
upper = mid - 1;
@@
-603,7
+603,7
@@
template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
}
mid = lower + ((upper-lower)>>1);
}
mid = lower + ((upper-lower)>>1);
- keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
+ keyRelation =
Compare::
compare(GET_KEY(el), GET_KEY(*mid));
if ( keyRelation < 0 )
upper = mid - 1;
if ( keyRelation < 0 )
upper = mid - 1;
@@
-662,7
+662,7
@@
template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
}
mid = lower + ((upper-lower)>>1);
}
mid = lower + ((upper-lower)>>1);
- keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
+ keyRelation =
Compare::
compare(GET_KEY(el), GET_KEY(*mid));
if ( keyRelation < 0 )
upper = mid - 1;
if ( keyRelation < 0 )
upper = mid - 1;
diff --git
a/aapl/bubblesort.h
b/aapl/bubblesort.h
index
bcc2fb6
..
4506208
100644
(file)
--- a/
aapl/bubblesort.h
+++ b/
aapl/bubblesort.h
@@
-72,7
+72,7
@@
template <class T, class Compare> void BubbleSort<T,Compare>::
changed = false;
for ( long i = 0; i < len-pass; i++ ) {
/* Do we swap pos with the next one? */
changed = false;
for ( long i = 0; i < len-pass; i++ ) {
/* Do we swap pos with the next one? */
- if ( compare( data[i], data[i+1] ) > 0 ) {
+ if (
Compare::
compare( data[i], data[i+1] ) > 0 ) {
char tmp[sizeof(T)];
/* Swap the two items. */
char tmp[sizeof(T)];
/* Swap the two items. */
diff --git
a/aapl/mergesort.h
b/aapl/mergesort.h
index
68b8426
..
835c279
100644
(file)
--- a/
aapl/mergesort.h
+++ b/
aapl/mergesort.h
@@
-110,7
+110,7
@@
template< class T, class Compare> void MergeSort<T,Compare>::
}
else {
/* Both upper and lower left. */
}
else {
/* Both upper and lower left. */
- if ( compare(*lower, *upper) <= 0 )
+ if (
Compare::
compare(*lower, *upper) <= 0 )
memcpy( dest++, lower++, sizeof(T) );
else
memcpy( dest++, upper++, sizeof(T) );
memcpy( dest++, lower++, sizeof(T) );
else
memcpy( dest++, upper++, sizeof(T) );
diff --git
a/packaging/ragel.spec
b/packaging/ragel.spec
index
207e2e9
..
cf6ee68
100644
(file)
--- a/
packaging/ragel.spec
+++ b/
packaging/ragel.spec
@@
-1,6
+1,6
@@
Name: ragel
Summary: Ragel
Name: ragel
Summary: Ragel
-Version: 6.
6
+Version: 6.
8
Release: 1
Group: TO_BE/FILLED_IN
License: TO BE FILLED IN
Release: 1
Group: TO_BE/FILLED_IN
License: TO BE FILLED IN
@@
-36,8
+36,11
@@
make %{?jobs:-j%jobs}
%install
rm -rf %{buildroot}
%make_install
%install
rm -rf %{buildroot}
%make_install
+mkdir -p %{buildroot}/usr/share/license
+cp %{_builddir}/%{buildsubdir}/COPYING %{buildroot}/usr/share/license/%{name}
%files
%{_bindir}/ragel
%{_defaultdocdir}/*
%files
%{_bindir}/ragel
%{_defaultdocdir}/*
+/usr/share/license/%{name}