Build: Warnings

Fixed some compiler warnings, joint ops with ebsi and stalli

review id = 10
This commit is contained in:
Manuel Dobusch
2014-04-30 17:11:12 +02:00
parent ad54b0d1fa
commit 6b82ea6860
8 changed files with 46 additions and 29 deletions
+12 -6
View File
@@ -4,15 +4,21 @@
#include "data/TextLocationLine.h"
TextLocation::TextLocation(
const std::weak_ptr<TextLocationLine>& textLocationLine,
const std::weak_ptr<Element>& element,
unsigned int column)
: m_textLocationLine(textLocationLine)
, m_element(element)
, m_column(column)
std::weak_ptr<TextLocationLine> textLocationLine,
std::weak_ptr<Element> element,
unsigned int column
)
: m_element(element)
, m_textLocationLine(textLocationLine)
, m_column(column)
{
}
TextLocation::~TextLocation()
{
}
unsigned int TextLocation::getColumn() const
{
return m_column;
}
+8 -6
View File
@@ -10,17 +10,19 @@ class TextLocation
{
public:
TextLocation(
const std::weak_ptr<TextLocationLine>& textLocationLine,
const std::weak_ptr<Element>& element,
unsigned int column);
std::weak_ptr<TextLocationLine> textLocationLine,
std::weak_ptr<Element> element,
unsigned int column
);
~TextLocation();
unsigned int getColumn() const;
private:
const unsigned int m_column;
const std::weak_ptr<TextLocationLine> m_textLocationLine;
const std::weak_ptr<Element> m_element;
const std::weak_ptr<TextLocationLine> m_textLocationLine;
const unsigned int m_column;
};
#endif // TEXT_LOCATION_H
+8 -3
View File
@@ -2,12 +2,17 @@
#include "data/TextLocationFile.h"
TextLocationLine::TextLocationLine(const std::weak_ptr<TextLocationFile>& textLocationFile, unsigned int lineNumber)
: m_textLocationFile(textLocationFile)
, m_lineNumber(lineNumber)
TextLocationLine::TextLocationLine(std::weak_ptr<TextLocationFile> textLocationFile, unsigned int lineNumber)
: m_textLocationFile(textLocationFile)
, m_lineNumber(lineNumber)
{
}
TextLocationLine::~TextLocationLine()
{
}
unsigned int TextLocationLine::getLineNumber() const
{
return m_lineNumber;
}
+3 -1
View File
@@ -11,10 +11,12 @@ class TextLocationFile;
class TextLocationLine
{
public:
TextLocationLine(const std::weak_ptr<TextLocationFile>& textLocationFile, unsigned int lineNumber);
TextLocationLine(std::weak_ptr<TextLocationFile> textLocationFile, unsigned int lineNumber);
~TextLocationLine();
unsigned int getLineNumber() const;
private:
const std::weak_ptr<TextLocationFile> m_textLocationFile;
const unsigned int m_lineNumber;