wbrawner/homebrew-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

aplus: fix C++ syntax errors

Browse source 
Allows compilation with clang.

Fixes Homebrew/homebrew#23026.
This commit is contained in:
Adam Vandenberg 2013-11-16 19:41:54 -08:00
parent d7a6f04157
commit 6b4f4f9be9
1 changed files with 84 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
Formula/aplus.rb
View file

@ -7,6 +7,7 @@ class Aplus < Formula
sha1 'e757cc7654cf35dba15a6a5d6cac5320146558fc'
# Fix the missing CoreServices include (via Fink version of aplus)
# Fix C++ syntax errors for clang
def patches
DATA
end
@ -45,3 +46,86 @@ __END__
#include <MSGUI/MSTextField.H>
#include <MSGUI/MSWidget.H>
#include <MSIPC/MSTv.H>
diff --git a/src/MSTypes/MSBuiltinTypeVectorInlines.C b/src/MSTypes/MSBuiltinTypeVectorInlines.C
index 051f4e9..9be8070 100644
--- a/src/MSTypes/MSBuiltinTypeVectorInlines.C
+++ b/src/MSTypes/MSBuiltinTypeVectorInlines.C
@@ -77,7 +77,7 @@ INLINELINKAGE MSBuiltinVector<Type> MSBuiltinVector<Type>::operator[] (const MSI
template <class Type>
INLINELINKAGE MSBuiltinVector<Type> MSBuiltinVector<Type>::operator[] (const MSBinaryVector & bVect_) const
{
- return compress (*this, bVect_);
+ return this->compress (*this, bVect_);
}
diff --git a/src/MSTypes/MSFloatMatrix.H b/src/MSTypes/MSFloatMatrix.H
index b8545bc..1bb6351 100644
--- a/src/MSTypes/MSFloatMatrix.H
+++ b/src/MSTypes/MSFloatMatrix.H
@@ -27,7 +27,7 @@ template<class Type> class MSTypeVector;
template<class Type> class MSMatrixSTypePick; // MSTypeMatrix indexed by an unsigned int
#if !defined(MS_NO_PREDECLARE_SPECIALIZATION)
-class MSMatrixSTypePick<double>;
+template<> class MSMatrixSTypePick<double>;
#endif
diff --git a/src/MSTypes/MSObjectTypeVectorInlines.C b/src/MSTypes/MSObjectTypeVectorInlines.C
index d5d6aa4..43fb49e 100644
--- a/src/MSTypes/MSObjectTypeVectorInlines.C
+++ b/src/MSTypes/MSObjectTypeVectorInlines.C
@@ -87,7 +87,7 @@ INLINELINKAGE MSObjectVector<Type> MSObjectVector<Type>::operator[] (const MSInd
template <class Type>
INLINELINKAGE MSObjectVector<Type> MSObjectVector<Type>::operator[] (const MSBinaryVector & bVect_) const
{
- return compress (*this, bVect_);
+ return this->compress (*this, bVect_);
}
diff --git a/src/MSTypes/MSObservableTree.C b/src/MSTypes/MSObservableTree.C
index 5fb769b..0c2e442 100644
--- a/src/MSTypes/MSObservableTree.C
+++ b/src/MSTypes/MSObservableTree.C
@@ -94,7 +94,7 @@ template <class Element>
void MSObservableTree<Element>::removeSubtree(const MSTabularTreeCursor<Element>& cursor_)
{
MSTabularTreeCursor<Element> cursor2(cursor_);
- unsigned long pos=position(cursor2);
+ unsigned long pos=this->position(cursor2);
cursor2.setToParent();
MSTabularTree<Element>::removeSubtree(cursor_);
if (cursor2.isValid()) changed(cursor2,pos,MSObservableTreeDelete);
@@ -162,7 +162,7 @@ template <class Element>
void MSObservableTree<Element>::replaceAt(MSTabularTreeCursor<Element> const& cursor_,Element const& element_)
{
MSTabularTree<Element>::replaceAt(cursor_,element_);
- changed(cursor_,position(cursor_),MSObservableTreeAssign);
+ changed(cursor_,this->position(cursor_),MSObservableTreeAssign);
}
template <class Element>
@@ -170,10 +170,10 @@ void MSObservableTree<Element>::replaceAt(MSTabularTreeCursor<Element> const& cu
{
if (&tree_!=this)
{
- if (isRoot(cursor_)) copy(tree_);
+ if (this->isRoot(cursor_)) copy(tree_);
else
{
- unsigned long pos=position(cursor_);
+ unsigned long pos=this->position(cursor_);
MSTabularTreeCursor<Element> cursor=cursor_;
cursor.setToParent();
MSTabularTree<Element>::removeSubtree(cursor_);
@@ -199,7 +199,7 @@ void MSObservableTree<Element>::permuteChildren(MSTabularTreeCursor<Element> con
template <class Element>
void MSObservableTree<Element>::elementChanged(MSTabularTreeCursor<Element> const& cursor_)
{
- changed(cursor_,position(cursor_),MSObservableTreeAssign);
+ changed(cursor_,this->position(cursor_),MSObservableTreeAssign);
}
template <class Element>