From: rtrimana <rtrimana@uci.edu>
Date: Tue, 25 Apr 2017 20:17:31 +0000 (-0700)
Subject: Making C++ classes final
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iot2.git;a=commitdiff_plain;h=d6dfb71f4ffc4720ab531d133767c067724e8919

Making C++ classes final
---

diff --git a/iotjava/Makefile b/iotjava/Makefile
index 2ff4d53..c3d55c4 100644
--- a/iotjava/Makefile
+++ b/iotjava/Makefile
@@ -140,8 +140,8 @@ compile:
 	#cp ./iotrmi/C++/basics/* $(BIN_DIR)/iotpolicy/output_files/Cplus
 	cd $(BIN_DIR)/iotpolicy/output_files; cp *.java ./Java
 	cd $(BIN_DIR)/iotpolicy/output_files; cp *.hpp ./Cplus
-	cd $(BIN_DIR)/iotpolicy/output_files/Java; $(JAVAC) -cp .:..:../../../$(BIN_DIR) TestClass_ProfilingStub.java
-	cd $(BIN_DIR)/iotpolicy/output_files/Java; $(JAVAC) -cp .:..:../../../$(BIN_DIR) TestClass_Skeleton.java
+#	cd $(BIN_DIR)/iotpolicy/output_files/Java; $(JAVAC) -cp .:..:../../../$(BIN_DIR) TestClass_ProfilingStub.java
+#	cd $(BIN_DIR)/iotpolicy/output_files/Java; $(JAVAC) -cp .:..:../../../$(BIN_DIR) TestClass_Skeleton.java
 	#cd $(BIN_DIR)/iotpolicy/output_files/Java; $(JAVAC) -cp .:..:../../../$(BIN_DIR) TestClassAdvanced_Stub.java
 	#cd $(BIN_DIR)/iotpolicy/output_files/Java; $(JAVAC) -cp .:..:../../../$(BIN_DIR) TestClassCallbacks_Stub.java
 #	cd $(BIN_DIR)/iotpolicy/output_files/Java; $(JAVAC) -cp .:..:../../../$(BIN_DIR) TestClassInterface_Skeleton.java -Xlint:unchecked
@@ -151,8 +151,8 @@ compile:
 #	cd $(BIN_DIR)/iotpolicy/output_files/Java; $(JAVAC) -cp .:..:../../../$(BIN_DIR) CallBackInterface_CallbackSkeleton.java
 #	cd $(BIN_DIR)/iotpolicy/output_files/Java; $(JAVAC) -cp .:..:../../../$(BIN_DIR) CallBackInterfaceWithCallBack_CallbackStub.java
 
-	#cd $(BIN_DIR)/iotpolicy/output_files/Cplus; $(G++) ./TestClassInterface_Skeleton.cpp -o ./TestClassInterface_Skeleton.out --std=c++11 -pthread -pg -I../../../../iotjava/iotrmi/C++/
-	#cd $(BIN_DIR)/iotpolicy/output_files/Cplus; $(G++) ./TestClassComplete_Stub.cpp -o ./TestClassComplete_Stub.out --std=c++11 -pthread -pg -I../../../../iotjava/iotrmi/C++/
+	cd $(BIN_DIR)/iotpolicy/output_files/Cplus; $(G++) ./TestClassInterface_Skeleton.cpp -o ./TestClassInterface_Skeleton.out --std=c++11 -pthread -pg -I../../../../iotjava/iotrmi/C++/
+	cd $(BIN_DIR)/iotpolicy/output_files/Cplus; $(G++) ./TestClassComplete_Stub.cpp -o ./TestClassComplete_Stub.out --std=c++11 -pthread -pg -I../../../../iotjava/iotrmi/C++/
 	#cp ./iotrmi/C++/ConcurrentLinkedListQueue.cpp $(BIN_DIR)/iotpolicy/output_files/Cplus
 	#cd $(BIN_DIR)/iotpolicy/output_files/Cplus; $(G++) ./ConcurrentLinkedListQueue.cpp -o ./ConcurrentLinkedListQueue.out --std=c++11 -pthread -pg -I../../../../iotjava/iotrmi/C++/
 
diff --git a/iotjava/iotrmi/C++/ConcurrentLinkedListQueue.hpp b/iotjava/iotrmi/C++/ConcurrentLinkedListQueue.hpp
index 2007323..6c9220a 100644
--- a/iotjava/iotrmi/C++/ConcurrentLinkedListQueue.hpp
+++ b/iotjava/iotrmi/C++/ConcurrentLinkedListQueue.hpp
@@ -19,7 +19,7 @@ using namespace std;
 
 mutex queueMutex;
 
-class Node {
+class Node final {
 
 	private:
 		Node* next;
@@ -37,7 +37,7 @@ class Node {
 };
 
 
-class ConcurrentLinkedListQueue {
+class ConcurrentLinkedListQueue final {
 
 	private:
 		Node* tail;
diff --git a/iotjava/iotrmi/C++/IoTRMICall.hpp b/iotjava/iotrmi/C++/IoTRMICall.hpp
index a92f3e3..ee04ef1 100644
--- a/iotjava/iotrmi/C++/IoTRMICall.hpp
+++ b/iotjava/iotrmi/C++/IoTRMICall.hpp
@@ -23,7 +23,7 @@ using namespace std;
 
 mutex mtx;
 
-class IoTRMICall {
+class IoTRMICall final {
 	public:
 		IoTRMICall(int _port, const char* _address, int _rev, bool* _bResult);
 		~IoTRMICall();
diff --git a/iotjava/iotrmi/C++/IoTRMICommClient.hpp b/iotjava/iotrmi/C++/IoTRMICommClient.hpp
index 0328059..db3e1e3 100644
--- a/iotjava/iotrmi/C++/IoTRMICommClient.hpp
+++ b/iotjava/iotrmi/C++/IoTRMICommClient.hpp
@@ -22,7 +22,7 @@ using namespace std;
 mutex clientRemoteCallMutex;
 mutex clientSendReturnObjMutex;
 
-class IoTRMICommClient : public IoTRMIComm {
+class IoTRMICommClient final : public IoTRMIComm {
 	public:
 		IoTRMICommClient(int _portSend, int _portRecv, const char* _address, int _rev, bool* _bResult);
 		~IoTRMICommClient();
diff --git a/iotjava/iotrmi/C++/IoTRMICommServer.hpp b/iotjava/iotrmi/C++/IoTRMICommServer.hpp
index 18f59c2..1af6438 100644
--- a/iotjava/iotrmi/C++/IoTRMICommServer.hpp
+++ b/iotjava/iotrmi/C++/IoTRMICommServer.hpp
@@ -20,7 +20,7 @@
 using namespace std;
 
 
-class IoTRMICommServer : public IoTRMIComm {
+class IoTRMICommServer final : public IoTRMIComm {
 	public:
 		IoTRMICommServer(int _portSend, int _portRecv, bool* _bResult);
 		~IoTRMICommServer();
diff --git a/iotjava/iotrmi/C++/IoTRMIObject.hpp b/iotjava/iotrmi/C++/IoTRMIObject.hpp
index 1dd3d57..7d0312c 100644
--- a/iotjava/iotrmi/C++/IoTRMIObject.hpp
+++ b/iotjava/iotrmi/C++/IoTRMIObject.hpp
@@ -20,7 +20,7 @@
 
 using namespace std;
 
-class IoTRMIObject {
+class IoTRMIObject final {
 	public:
 		IoTRMIObject(int _port, bool* _bResult);
 		~IoTRMIObject();
diff --git a/iotjava/iotrmi/C++/IoTRMITypes.hpp b/iotjava/iotrmi/C++/IoTRMITypes.hpp
index 629543d..673479e 100644
--- a/iotjava/iotrmi/C++/IoTRMITypes.hpp
+++ b/iotjava/iotrmi/C++/IoTRMITypes.hpp
@@ -16,7 +16,7 @@
 
 using namespace std;
 
-class IoTRMITypes {
+class IoTRMITypes final {
 
 	public:
 		/* Public constants */
diff --git a/iotjava/iotrmi/C++/IoTRMIUtil.hpp b/iotjava/iotrmi/C++/IoTRMIUtil.hpp
index 74f6d32..2f18adc 100644
--- a/iotjava/iotrmi/C++/IoTRMIUtil.hpp
+++ b/iotjava/iotrmi/C++/IoTRMIUtil.hpp
@@ -27,7 +27,7 @@
 
 using namespace std;
 
-class IoTRMIUtil {
+class IoTRMIUtil final {
 
 	public:
 		IoTRMIUtil();
diff --git a/iotjava/iotrmi/C++/IoTSocketClient.hpp b/iotjava/iotrmi/C++/IoTSocketClient.hpp
index b69555f..4f5dec5 100644
--- a/iotjava/iotrmi/C++/IoTSocketClient.hpp
+++ b/iotjava/iotrmi/C++/IoTSocketClient.hpp
@@ -16,7 +16,7 @@
 
 #include "IoTSocket.hpp"
 
-class IoTSocketClient : public IoTSocket
+class IoTSocketClient final : public IoTSocket
 {
 	public:
 		IoTSocketClient(int iPort, const char* pStrHost, bool bReverse, bool* pResult);
diff --git a/iotjava/iotrmi/C++/IoTSocketServer.hpp b/iotjava/iotrmi/C++/IoTSocketServer.hpp
index 3d56e70..47400f9 100644
--- a/iotjava/iotrmi/C++/IoTSocketServer.hpp
+++ b/iotjava/iotrmi/C++/IoTSocketServer.hpp
@@ -18,7 +18,7 @@
 
 #define BACKLOG 10      // How many pending connections queue will hold 
 
-class IoTSocketServer : public IoTSocket
+class IoTSocketServer final : public IoTSocket
 {
   public:
 		IoTSocketServer(int iPort, bool* pResult);
diff --git a/iotjava/iotruntime/cpp/IoTDeviceAddress.hpp b/iotjava/iotruntime/cpp/IoTDeviceAddress.hpp
index da6a695..0c54ab0 100644
--- a/iotjava/iotruntime/cpp/IoTDeviceAddress.hpp
+++ b/iotjava/iotruntime/cpp/IoTDeviceAddress.hpp
@@ -14,7 +14,7 @@ using namespace std;
 // @since       2017-01-09
 
 
-class IoTDeviceAddress : public IoTAddress
+class IoTDeviceAddress final : public IoTAddress
 {
 
 	public:
diff --git a/iotjava/iotruntime/cpp/IoTUDP.hpp b/iotjava/iotruntime/cpp/IoTUDP.hpp
index d712d4b..90e88ab 100644
--- a/iotjava/iotruntime/cpp/IoTUDP.hpp
+++ b/iotjava/iotruntime/cpp/IoTUDP.hpp
@@ -13,7 +13,7 @@ using namespace std;
 // @version     1.0
 // @since       2017-01-09
 
-class IoTUDP
+class IoTUDP final
 {
 	// IoTUDP class properties
 	private:
diff --git a/iotjava/iotruntime/cpp/iotslave/IoTSlave.hpp b/iotjava/iotruntime/cpp/iotslave/IoTSlave.hpp
index 834580a..99d2189 100644
--- a/iotjava/iotruntime/cpp/iotslave/IoTSlave.hpp
+++ b/iotjava/iotruntime/cpp/iotslave/IoTSlave.hpp
@@ -54,7 +54,7 @@ typedef void destroy_t(void*);
 typedef void init_t(void*);
 
 
-class IoTSlave {
+class IoTSlave final {
 
 	private:
 		// Constants
diff --git a/iotjava/iotruntime/cpp/setrelation/IRelation.hpp b/iotjava/iotruntime/cpp/setrelation/IRelation.hpp
index 5261c30..17be572 100644
--- a/iotjava/iotruntime/cpp/setrelation/IRelation.hpp
+++ b/iotjava/iotruntime/cpp/setrelation/IRelation.hpp
@@ -13,7 +13,7 @@ using namespace std;
  * @since       2016-09-06
  */
 template <class K,class V>
-class IRelation {
+class IRelation final {
 	private:
 		unordered_multimap<K,V>* rel;
 	public:
diff --git a/iotjava/iotruntime/cpp/setrelation/ISet.hpp b/iotjava/iotruntime/cpp/setrelation/ISet.hpp
index 667b8ce..5d8d295 100644
--- a/iotjava/iotruntime/cpp/setrelation/ISet.hpp
+++ b/iotjava/iotruntime/cpp/setrelation/ISet.hpp
@@ -13,7 +13,7 @@ using namespace std;
  * @since       2016-09-06
  */
 template <class T>
-class ISet {
+class ISet final {
 	private:
 		unordered_set<T>* set;
 	public:
diff --git a/iotjava/iotruntime/cpp/setrelation/IoTRelation.hpp b/iotjava/iotruntime/cpp/setrelation/IoTRelation.hpp
index ad1f8bf..a3f6c21 100644
--- a/iotjava/iotruntime/cpp/setrelation/IoTRelation.hpp
+++ b/iotjava/iotruntime/cpp/setrelation/IoTRelation.hpp
@@ -13,7 +13,7 @@ using namespace std;
  * @since       2016-09-06
  */
 template <class K,class V>
-class IoTRelation {
+class IoTRelation final {
 	private:
 		const unordered_multimap<K,V>* rel;
 	public:
diff --git a/iotjava/iotruntime/cpp/setrelation/IoTSet.hpp b/iotjava/iotruntime/cpp/setrelation/IoTSet.hpp
index 0c45ca8..e2a966d 100644
--- a/iotjava/iotruntime/cpp/setrelation/IoTSet.hpp
+++ b/iotjava/iotruntime/cpp/setrelation/IoTSet.hpp
@@ -13,7 +13,7 @@ using namespace std;
  * @since       2016-09-06
  */
 template <class T>
-class IoTSet {
+class IoTSet final {
 	private:
 		const unordered_set<T>* set;
 	public: