Lower down GCC required version to 4.7

Resolve #28
ia-toki · Mar 29, 2015 · c98c115 · c98c115
1 parent 38b3adf
commit c98c115
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 57 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,9 +6,9 @@ before_install:
   - sudo pip install cpp-coveralls
 
 install:
-  - sudo apt-get -qq install g++-4.9
-  - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 90
-  - sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-4.9 90
+  - sudo apt-get -qq install g++-4.7
+  - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 90
+  - sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-4.7 90
   - sudo apt-get install libgtest-dev
   - cd /usr/src/gtest && sudo cmake . && sudo cmake --build . && sudo mv libg* /usr/local/lib/ ; cd -
 

diff --git a/docs/basic_concepts.rst b/docs/basic_concepts.rst
@@ -471,7 +471,7 @@ For example:
 
 .. note::
 
-    The current version needs GCC version 4.9.
+    The current version needs GCC version >= 4.7.
 
 Running generator program
 -------------------------

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -7,7 +7,7 @@ Dependencies
 **tcframe** needs the following minimum requirements:
 
 - UNIX-based operating system
-- GCC >= 4.9
+- GCC >= 4.7
 
 Setup
 -----

diff --git a/include/tcframe/exception.hpp b/include/tcframe/exception.hpp
@@ -17,7 +17,7 @@ class NotImplementedException : public exception { };
 
 class TestCaseException : public exception {
 public:
-    virtual ~TestCaseException() { }
+    virtual ~TestCaseException() noexcept { }
 
     vector<Failure> getFailures() {
         if (message != "") {

diff --git a/include/tcframe/io.hpp b/include/tcframe/io.hpp
@@ -95,7 +95,7 @@ class LineIOSegment : public IOSegment {
         throw IOFormatException("Variable type of `" + names[variables.size()] + "` unsatisfied. Expected: basic scalar or string type, or vector of those types");
     }
 
-    void printTo(ostream& out) override {
+    void printTo(ostream& out) {
         bool first = true;
         for (int i = 0; i < variables.size(); i++) {
             HorizontalVariable* variable = variables[i];
@@ -114,7 +114,7 @@ class LineIOSegment : public IOSegment {
         out << "\n";
     }
 
-    void parseFrom(istream& in) override {
+    void parseFrom(istream& in) {
         for (int i = 0; i < variables.size(); i++) {
             HorizontalVariable* variable = variables[i];
 
@@ -214,7 +214,7 @@ class LinesIOSegment : public IOSegment {
         }
     }
 
-    void printTo(ostream& out) override {
+    void printTo(ostream& out) {
         checkState();
         checkVectorSizes();
 
@@ -231,7 +231,7 @@ class LinesIOSegment : public IOSegment {
         }
     }
 
-    void parseFrom(istream& in) override {
+    void parseFrom(istream& in) {
         checkState();
 
         for (VerticalVariable* variable : variables) {
@@ -323,7 +323,7 @@ class GridIOSegment : public IOSegment {
         }
     }
 
-    void printTo(ostream& out) override {
+    void printTo(ostream& out) {
         checkState();
         checkMatrixSizes();
 
@@ -338,7 +338,7 @@ class GridIOSegment : public IOSegment {
         }
     }
 
-    void parseFrom(istream& in) override {
+    void parseFrom(istream& in) {
         checkState();
         variable->clear();
 

diff --git a/include/tcframe/logger.hpp b/include/tcframe/logger.hpp
@@ -28,11 +28,11 @@ class Logger {
 
 class StandardLogger : public Logger {
 public:
-    void logIntroduction() override {
+    void logIntroduction() {
         cout << "Generating test cases..." << endl;
     }
 
-    void logTestGroupIntroduction(int testGroupId) override {
+    void logTestGroupIntroduction(int testGroupId) {
         cout << endl;
 
         if (testGroupId == 0) {
@@ -44,15 +44,15 @@ class StandardLogger : public Logger {
         }
     }
 
-    void logTestCaseIntroduction(string testCaseName) override {
+    void logTestCaseIntroduction(string testCaseName) {
         cout << "  " << testCaseName << ": " << flush;
     }
 
-    void logTestCaseOkResult() override {
+    void logTestCaseOkResult() {
         cout << "OK" << endl;
     }
 
-    void logTestCaseFailedResult(string testCaseDescription) override {
+    void logTestCaseFailedResult(string testCaseDescription) {
         cout << "FAILED" << endl;
 
         if (testCaseDescription != "") {
@@ -62,13 +62,13 @@ class StandardLogger : public Logger {
         cout << "    Reasons:" << endl;
     }
 
-    void logInputFormatFailedResult() override {
+    void logInputFormatFailedResult() {
         cout << endl;
         cout << "  Input format check: FAILED" << endl;
         cout << "    Reasons:" << endl;
     }
 
-    void logFailures(vector<Failure> failures) override {
+    void logFailures(vector<Failure> failures) {
         for (Failure failure : failures) {
             string prefix;
             if (failure.getLevel() == 0) {

diff --git a/include/tcframe/os.hpp b/include/tcframe/os.hpp
@@ -38,28 +38,28 @@ class UnixOperatingSystem : public OperatingSystem {
     UnixOperatingSystem()
             : baseDirectoryName(".") { }
 
-    void setBaseDirectory(string baseDirectoryName) override {
+    void setBaseDirectory(string baseDirectoryName) {
         this->baseDirectoryName = baseDirectoryName;
 
         system(("rm -rf " + baseDirectoryName).c_str());
         system(("mkdir -p " + baseDirectoryName).c_str());
     }
 
-    istream* openForReading(string name) override {
+    istream* openForReading(string name) {
         string filename = baseDirectoryName + "/" + name;
         ifstream* file = new ifstream();
         file->open(filename);
         return file;
     }
 
-    ostream* openForWriting(string name) override {
+    ostream* openForWriting(string name) {
         string filename = baseDirectoryName + "/" + name;
         ofstream* file = new ofstream();
         file->open(filename);
         return file;
     }
 
-    ExecutionResult execute(string command, string inputName, string outputName) override {
+    ExecutionResult execute(string command, string inputName, string outputName) {
         string inputFilename = baseDirectoryName + "/" + inputName;
         string outputFilename = baseDirectoryName + "/" + outputName;
         string errorFilename = baseDirectoryName + "/_error.out";
@@ -73,7 +73,7 @@ class UnixOperatingSystem : public OperatingSystem {
         return result;
     }
 
-    void remove(string name) override {
+    void remove(string name) {
         string filename = baseDirectoryName + "/" + name;
         removeFile(filename);
     }

diff --git a/include/tcframe/testcase.hpp b/include/tcframe/testcase.hpp
@@ -28,11 +28,11 @@ class OfficialTestCase : public TestCase {
     OfficialTestCase(function<void()> closure, string description, set<int> subtaskIds)
             : closure(closure), description(description), subtaskIds(subtaskIds) { }
 
-    string getDescription() override {
+    string getDescription() {
         return description;
     }
 
-    set<int> getSubtaskIds() override {
+    set<int> getSubtaskIds() {
         return subtaskIds;
     }
 
@@ -52,11 +52,11 @@ class SampleTestCase : public TestCase {
     SampleTestCase(string content, set<int> subtaskIds) :
         content(content), subtaskIds(subtaskIds) { }
 
-    string getDescription() override {
+    string getDescription() {
         return "";
     }
 
-    set<int> getSubtaskIds() override {
+    set<int> getSubtaskIds() {
         return subtaskIds;
     }
 

diff --git a/include/tcframe/type.hpp b/include/tcframe/type.hpp
@@ -117,15 +117,15 @@ class Scalar : public ScalarHorizontalVariable {
     Scalar(T& value, string name)
             : ScalarHorizontalVariable(name), value(&value) { }
 
-    void printTo(ostream& out) override {
+    void printTo(ostream& out) {
         out << *value;
     }
 
-    void parseFrom(istream& in) override {
+    void parseFrom(istream& in) {
         parseVariableFrom(in, value, getName());
     }
 
-    void clear() override {
+    void clear() {
         *value = T();
     }
 
@@ -139,22 +139,22 @@ class HorizontalVector : public VectorHorizontalVariable {
     HorizontalVector(vector<T>& value, string name)
             : VectorHorizontalVariable(name), value(&value) { }
 
-    int size() override {
+    int size() {
         return (int)(value->size());
     }
 
-    void printElementTo(int index, ostream& out) override {
+    void printElementTo(int index, ostream& out) {
         out << (*value)[index];
     }
 
-    void parseAndAddElementFrom(istream& in) override {
+    void parseAndAddElementFrom(istream& in) {
         int index = (int)value->size();
         T element;
         parseVariableFrom(in, &element, getName() + "[" + Util::toString(index) + "]");
         value->push_back(element);
     }
 
-    void clear() override {
+    void clear() {
         *value = vector<T>();
     }
 
@@ -181,22 +181,22 @@ class VerticalVector : public VerticalVariable {
     VerticalVector(vector<T>& value, string name)
             : VerticalVariable(name), value(&value) { }
 
-    int size() override {
+    int size() {
         return (int)(value->size());
     }
 
-    void printElementTo(int index, ostream& out) override {
+    void printElementTo(int index, ostream& out) {
         out << (*value)[index];
     }
 
-    void parseAndAddElementFrom(istream& in) override {
+    void parseAndAddElementFrom(istream& in) {
         int index = (int)value->size();
         T element;
         parseVariableFrom(in, &element, getName() + "[" + Util::toString(index) + "]");
         value->push_back(element);
     }
 
-    void clear() override {
+    void clear() {
         *value = vector<T>();
     }
 
@@ -225,23 +225,23 @@ class Matrix : public MatrixVariable {
     Matrix(vector<vector<T>>& value, string name)
             : MatrixVariable(name), value(&value) { }
 
-    int rowsSize() override {
+    int rowsSize() {
         return (int)(value->size());
     }
 
-    int columnsSize(int rowIndex) override {
+    int columnsSize(int rowIndex) {
         return (int)((*value)[rowIndex].size());
     }
 
-    void printElementTo(int rowIndex, int columnIndex, ostream& out) override {
+    void printElementTo(int rowIndex, int columnIndex, ostream& out) {
         out << (*value)[rowIndex][columnIndex];
     }
 
-    void addRow() override {
+    void addRow() {
         value->push_back(vector<T>());
     }
 
-    void parseAndAddColumnElementFrom(istream& in) override {
+    void parseAndAddColumnElementFrom(istream& in) {
         int rowIndex = (int)value->size() - 1;
         int columnIndex = (int)value->back().size();
 
@@ -250,7 +250,7 @@ class Matrix : public MatrixVariable {
         value->back().push_back(element);
     }
 
-    void clear() override {
+    void clear() {
         *value = vector<vector<T>>();
     }
 

diff --git a/test/generator_test.cpp b/test/generator_test.cpp
@@ -27,18 +27,18 @@ class FakeLogger : public Logger {
     FakeLogger()
             : currentKey("inputFormat") { }
 
-    void logIntroduction() override { }
-    void logTestGroupIntroduction(int) override { }
+    void logIntroduction() { }
+    void logTestGroupIntroduction(int) { }
 
-    void logTestCaseIntroduction(string testCaseName) override {
+    void logTestCaseIntroduction(string testCaseName) {
         currentKey = testCaseName;
     }
 
-    void logTestCaseOkResult() override { }
-    void logTestCaseFailedResult(string) override { }
-    void logInputFormatFailedResult() override { }
+    void logTestCaseOkResult() { }
+    void logTestCaseFailedResult(string) { }
+    void logInputFormatFailedResult() { }
 
-    void logFailures(vector<Failure> failures) override {
+    void logFailures(vector<Failure> failures) {
         this->failuresMap[currentKey] = failures;
     }
 
@@ -58,21 +58,21 @@ class FakeOperatingSystem : public OperatingSystem {
     FakeOperatingSystem(set<string> arrangedFailedInputNames)
             : arrangedFailedInputNames(arrangedFailedInputNames) { }
 
-    void setBaseDirectory(string) override { }
+    void setBaseDirectory(string) { }
 
-    istream* openForReading(string) override {
+    istream* openForReading(string) {
         return new istringstream();
     }
 
-    ostream* openForWriting(string name) override {
+    ostream* openForWriting(string name) {
         ostringstream* testCaseInput = new ostringstream();
         testCaseInputs[name] = testCaseInput;
         return testCaseInput;
     }
 
-    void remove(string) override { }
+    void remove(string) { }
 
-    ExecutionResult execute(string, string inputName, string) override {
+    ExecutionResult execute(string, string inputName, string) {
         if (arrangedFailedInputNames.count(inputName)) {
             return ExecutionResult{1, new istringstream(), new istringstream("Intentionally failed")};
         }