mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-20 22:27:17 -08:00
dev-util/cccc: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/2783
This commit is contained in:
@@ -1,47 +0,0 @@
|
||||
--- cccc/posixgcc.mak
|
||||
+++ cccc/posixgcc.mak
|
||||
@@ -24,9 +24,11 @@
|
||||
|
||||
PATHSEP=/
|
||||
|
||||
+PCCTS_INC = /usr/include/pccts/
|
||||
+
|
||||
CCC=g++
|
||||
LD=g++
|
||||
-CFLAGS=-c -I../pccts/h $(CFLAGS_DEBUG) -x c++
|
||||
+CFLAGS=-c -I$(PCCTS_INC) $(CFLAGS_DEBUG) -x c++
|
||||
C_OFLAG=-o
|
||||
LDFLAGS=$(LDFLAGS_DEBUG)
|
||||
LD_OFLAG=-o
|
||||
|
||||
--- cccc/rules.mak
|
||||
+++ cccc/rules.mak
|
||||
@@ -39,8 +39,8 @@
|
||||
|
||||
# locations and flags for antlr and dlg (don't change the flags unless you
|
||||
# understand PCCTS)
|
||||
-ANTLR = $(PCCTS_BIN)$(PATHSEP)antlr
|
||||
-DLG = $(PCCTS_BIN)$(PATHSEP)dlg
|
||||
+ANTLR = antlr
|
||||
+DLG = dlg
|
||||
# Flags for ANTLR:
|
||||
# -CC = generate C++ output
|
||||
# -k 2 = use at least 2 tokens of lookahead
|
||||
@@ -164,14 +164,14 @@
|
||||
# to cover this is to add explicit rules for the three
|
||||
# PCCTS support files which give rise to linkable object
|
||||
# files.
|
||||
-AParser.$(OBJEXT): $(PCCTS_H)$(PATHSEP)AParser.cpp
|
||||
- $(CCC) $(CFLAGS) $(PCCTS_H)$(PATHSEP)AParser.cpp $(C_OFLAG)$*.$(OBJEXT)
|
||||
+AParser.$(OBJEXT): $(PCCTS_INC)$(PATHSEP)AParser.cpp
|
||||
+ $(CCC) $(CFLAGS) $(PCCTS_INC)$(PATHSEP)AParser.cpp $(C_OFLAG)$*.$(OBJEXT)
|
||||
|
||||
-DLexerBase.$(OBJEXT): $(PCCTS_H)$(PATHSEP)DLexerBase.cpp
|
||||
- $(CCC) $(CFLAGS) $(PCCTS_H)$(PATHSEP)DLexerBase.cpp $(C_OFLAG)$*.$(OBJEXT)
|
||||
+DLexerBase.$(OBJEXT): $(PCCTS_INC)$(PATHSEP)DLexerBase.cpp
|
||||
+ $(CCC) $(CFLAGS) $(PCCTS_INC)$(PATHSEP)DLexerBase.cpp $(C_OFLAG)$*.$(OBJEXT)
|
||||
|
||||
-ATokenBuffer.$(OBJEXT): $(PCCTS_H)$(PATHSEP)ATokenBuffer.cpp
|
||||
- $(CCC) $(CFLAGS) $(PCCTS_H)$(PATHSEP)ATokenBuffer.cpp $(C_OFLAG)$*.$(OBJEXT)
|
||||
+ATokenBuffer.$(OBJEXT): $(PCCTS_INC)$(PATHSEP)ATokenBuffer.cpp
|
||||
+ $(CCC) $(CFLAGS) $(PCCTS_INC)$(PATHSEP)ATokenBuffer.cpp $(C_OFLAG)$*.$(OBJEXT)
|
||||
@@ -1,95 +0,0 @@
|
||||
diff --git a/cccc/cccc_tbl.cc b/cccc/cccc_tbl.cc
|
||||
index df98e2b..c9d0bac 100644
|
||||
--- a/cccc/cccc_tbl.cc
|
||||
+++ b/cccc/cccc_tbl.cc
|
||||
@@ -27,18 +27,18 @@
|
||||
#define LINE_BUFFER_SIZE 1000
|
||||
|
||||
|
||||
-template <class T> CCCC_Table<T>::CCCC_Table()
|
||||
+template <class T> CCCC_Table<T>::CCCC_Table()
|
||||
: sorted(true)
|
||||
{
|
||||
- iter_ = map_t::end();
|
||||
+ iter_ = map_t::end();
|
||||
}
|
||||
|
||||
-template <class T> CCCC_Table<T>::~CCCC_Table()
|
||||
+template <class T> CCCC_Table<T>::~CCCC_Table()
|
||||
{
|
||||
// the container should manage the destruction of its own
|
||||
- // nodes correctly, we just need to get rid of the
|
||||
+ // nodes correctly, we just need to get rid of the
|
||||
// objects to which we hold pointers.
|
||||
- // NB Although CCCC_Table holds pointers, it owns the
|
||||
+ // NB Although CCCC_Table holds pointers, it owns the
|
||||
// objects they point to and is responsible for their disposal.
|
||||
T* itemptr=first_item();
|
||||
while(itemptr!=NULL)
|
||||
@@ -48,8 +48,8 @@ template <class T> CCCC_Table<T>::~CCCC_Table()
|
||||
}
|
||||
}
|
||||
|
||||
-template<class T>
|
||||
-int CCCC_Table<T>::get_count(const char* count_tag)
|
||||
+template<class T>
|
||||
+int CCCC_Table<T>::get_count(const char* count_tag)
|
||||
{
|
||||
int retval=0;
|
||||
T* itemptr=first_item();
|
||||
@@ -58,11 +58,11 @@ int CCCC_Table<T>::get_count(const char* count_tag)
|
||||
retval+=itemptr->get_count(count_tag);
|
||||
itemptr=next_item();
|
||||
}
|
||||
-
|
||||
+
|
||||
return retval;
|
||||
}
|
||||
|
||||
-template<class T>
|
||||
+template<class T>
|
||||
T* CCCC_Table<T>::find(string name)
|
||||
{
|
||||
T *retval=NULL;
|
||||
@@ -74,7 +74,7 @@ T* CCCC_Table<T>::find(string name)
|
||||
return retval;
|
||||
}
|
||||
|
||||
-template<class T>
|
||||
+template<class T>
|
||||
T* CCCC_Table<T>::find_or_insert(T* new_item_ptr)
|
||||
{
|
||||
string new_key=new_item_ptr->key();
|
||||
@@ -92,17 +92,17 @@ T* CCCC_Table<T>::find_or_insert(T* new_item_ptr)
|
||||
template<class T>
|
||||
bool CCCC_Table<T>::remove(T* old_item_ptr)
|
||||
{
|
||||
- bool retval=false;
|
||||
+ bool retval=false;
|
||||
typename map_t::iterator value_iterator=map_t::find(old_item_ptr->key());
|
||||
if(value_iterator!=map_t::end())
|
||||
{
|
||||
- erase(value_iterator);
|
||||
+ this->erase(value_iterator);
|
||||
retval=true;
|
||||
}
|
||||
return retval;
|
||||
}
|
||||
-
|
||||
-template <class T> void CCCC_Table<T>::sort()
|
||||
+
|
||||
+template <class T> void CCCC_Table<T>::sort()
|
||||
{
|
||||
if(sorted==false)
|
||||
{
|
||||
@@ -133,8 +133,8 @@ template <class T> T* CCCC_Table<T>::next_item()
|
||||
}
|
||||
|
||||
template <class T> int CCCC_Table<T>::records()
|
||||
-{
|
||||
- return map_t::size();
|
||||
+{
|
||||
+ return map_t::size();
|
||||
}
|
||||
|
||||
#endif // _CCCC_TBL_BODY
|
||||
Reference in New Issue
Block a user