[Fawkes Git] branch/bschaepers/asp-aspect: ASP-Aspect: Use a different name for the member.

Bjoern Schaepers bjoern.schaepers at rwth-aachen.de
Mon Oct 31 16:45:15 CET 2016


Changes have been pushed for the project "Fawkes Robotics Software Framework".

Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac:   http://trac.fawkesrobotics.org

The branch, bschaepers/asp-aspect has been updated
        to  050cadb8d8438039009e4606ffcb993d1c977f9d (commit)
      from  56eb16f2a00b20fc1ebfa9dfdf6cad041422b741 (commit)

http://git.fawkesrobotics.org/fawkes.git/bschaepers/asp-aspect

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- *Log* ---------------------------------------------------------------
commit 050cadb8d8438039009e4606ffcb993d1c977f9d
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Mon Oct 31 16:44:19 2016 +0100
Commit:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
CommitDate: Mon Oct 31 16:44:19 2016 +0100

    ASP-Aspect: Use a different name for the member.
    
    Clingo is also the name of the namespace, this confuses syntax
    highlighting and may confuse humans too, so change it.

http://git.fawkesrobotics.org/fawkes.git/commit/050cadb
http://trac.fawkesrobotics.org/changeset/050cadb

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -


- *Summary* -----------------------------------------------------------
 src/plugins/asp/aspect/asp.cpp |    6 +++---
 src/plugins/asp/aspect/asp.h   |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)


- *Diffs* -------------------------------------------------------------

- *commit* 050cadb8d8438039009e4606ffcb993d1c977f9d - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Mon Oct 31 16:44:19 2016 +0100
Subject: ASP-Aspect: Use a different name for the member.

 src/plugins/asp/aspect/asp.cpp |    6 +++---
 src/plugins/asp/aspect/asp.h   |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/asp/aspect/asp.cpp b/src/plugins/asp/aspect/asp.cpp
index 5aee875..5b53228 100644
--- a/src/plugins/asp/aspect/asp.cpp
+++ b/src/plugins/asp/aspect/asp.cpp
@@ -42,7 +42,7 @@ namespace fawkes {
  * @property ASPAspect::LogComponent
  * @brief The component for the logger.
  *
- * @property ASPAspect::ClingoControl
+ * @property ASPAspect::ClingoAcc
  * @brief Clingo Control for exclusive usage.
  */
 
@@ -74,7 +74,7 @@ ASPAspect::~ASPAspect(void)
 void
 ASPAspect::init_ASPAspect(const LockPtr<ClingoAccess>& clingo)
 {
-	Clingo = clingo;
+	ClingoAcc = clingo;
 	return;
 }
 
@@ -84,7 +84,7 @@ ASPAspect::init_ASPAspect(const LockPtr<ClingoAccess>& clingo)
 void
 ASPAspect::finalize_ASPAspect(void)
 {
-	Clingo.clear();
+	ClingoAcc.clear();
 	return;
 }
 
diff --git a/src/plugins/asp/aspect/asp.h b/src/plugins/asp/aspect/asp.h
index e749f8a..c9885d1 100644
--- a/src/plugins/asp/aspect/asp.h
+++ b/src/plugins/asp/aspect/asp.h
@@ -46,7 +46,7 @@ class ASPAspect : public virtual Aspect
 	void finalize_ASPAspect(void);
 
 	protected:
-	LockPtr<ClingoAccess> Clingo;
+	LockPtr<ClingoAccess> ClingoAcc;
 
 	public:
 	ASPAspect(const std::string&& controlName, const std::string&& logComponent = std::string());




-- 
Fawkes Robotics Framework                 http://www.fawkesrobotics.org


More information about the fawkes-commits mailing list