projects
/
iot2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
d227810
)
Making C++ classes final
author
rtrimana
<rtrimana@uci.edu>
Tue, 25 Apr 2017 20:17:31 +0000
(13:17 -0700)
committer
rtrimana
<rtrimana@uci.edu>
Tue, 25 Apr 2017 20:17:31 +0000
(13:17 -0700)
17 files changed:
iotjava/Makefile
patch
|
blob
|
history
iotjava/iotrmi/C++/ConcurrentLinkedListQueue.hpp
patch
|
blob
|
history
iotjava/iotrmi/C++/IoTRMICall.hpp
patch
|
blob
|
history
iotjava/iotrmi/C++/IoTRMICommClient.hpp
patch
|
blob
|
history
iotjava/iotrmi/C++/IoTRMICommServer.hpp
patch
|
blob
|
history
iotjava/iotrmi/C++/IoTRMIObject.hpp
patch
|
blob
|
history
iotjava/iotrmi/C++/IoTRMITypes.hpp
patch
|
blob
|
history
iotjava/iotrmi/C++/IoTRMIUtil.hpp
patch
|
blob
|
history
iotjava/iotrmi/C++/IoTSocketClient.hpp
patch
|
blob
|
history
iotjava/iotrmi/C++/IoTSocketServer.hpp
patch
|
blob
|
history
iotjava/iotruntime/cpp/IoTDeviceAddress.hpp
patch
|
blob
|
history
iotjava/iotruntime/cpp/IoTUDP.hpp
patch
|
blob
|
history
iotjava/iotruntime/cpp/iotslave/IoTSlave.hpp
patch
|
blob
|
history
iotjava/iotruntime/cpp/setrelation/IRelation.hpp
patch
|
blob
|
history
iotjava/iotruntime/cpp/setrelation/ISet.hpp
patch
|
blob
|
history
iotjava/iotruntime/cpp/setrelation/IoTRelation.hpp
patch
|
blob
|
history
iotjava/iotruntime/cpp/setrelation/IoTSet.hpp
patch
|
blob
|
history
diff --git
a/iotjava/Makefile
b/iotjava/Makefile
index 2ff4d533548ae82e5d3330272b8004546f6c23b1..c3d55c473cad22d4ea3c58a1eefa2880f3aedd56 100644
(file)
--- 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
#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
#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/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++/
#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 20073236b629d05d70ed2b27a975d11a37f0b114..6c9220a6648a048b49b3c87304e3fb5476f95606 100644
(file)
--- a/
iotjava/iotrmi/C++/ConcurrentLinkedListQueue.hpp
+++ b/
iotjava/iotrmi/C++/ConcurrentLinkedListQueue.hpp
@@
-19,7
+19,7
@@
using namespace std;
mutex queueMutex;
mutex queueMutex;
-class Node {
+class Node
final
{
private:
Node* next;
private:
Node* next;
@@
-37,7
+37,7
@@
class Node {
};
};
-class ConcurrentLinkedListQueue {
+class ConcurrentLinkedListQueue
final
{
private:
Node* tail;
private:
Node* tail;
diff --git
a/iotjava/iotrmi/C++/IoTRMICall.hpp
b/iotjava/iotrmi/C++/IoTRMICall.hpp
index a92f3e3732da99b090073d334cf5d96d47abd3f8..ee04ef193da72d81a57369344153ac84bce7b3be 100644
(file)
--- a/
iotjava/iotrmi/C++/IoTRMICall.hpp
+++ b/
iotjava/iotrmi/C++/IoTRMICall.hpp
@@
-23,7
+23,7
@@
using namespace std;
mutex mtx;
mutex mtx;
-class IoTRMICall {
+class IoTRMICall
final
{
public:
IoTRMICall(int _port, const char* _address, int _rev, bool* _bResult);
~IoTRMICall();
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 0328059c058be907b56a16cc7aac993f55c2fa45..db3e1e31b8557fc50c749a32beaf80257da41962 100644
(file)
--- a/
iotjava/iotrmi/C++/IoTRMICommClient.hpp
+++ b/
iotjava/iotrmi/C++/IoTRMICommClient.hpp
@@
-22,7
+22,7
@@
using namespace std;
mutex clientRemoteCallMutex;
mutex clientSendReturnObjMutex;
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();
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 18f59c21fbe7e985befbae7da649501482d33eb7..1af6438695356e2bd869bb312baa224ef84a0f85 100644
(file)
--- a/
iotjava/iotrmi/C++/IoTRMICommServer.hpp
+++ b/
iotjava/iotrmi/C++/IoTRMICommServer.hpp
@@
-20,7
+20,7
@@
using namespace std;
using namespace std;
-class IoTRMICommServer : public IoTRMIComm {
+class IoTRMICommServer
final
: public IoTRMIComm {
public:
IoTRMICommServer(int _portSend, int _portRecv, bool* _bResult);
~IoTRMICommServer();
public:
IoTRMICommServer(int _portSend, int _portRecv, bool* _bResult);
~IoTRMICommServer();
diff --git
a/iotjava/iotrmi/C++/IoTRMIObject.hpp
b/iotjava/iotrmi/C++/IoTRMIObject.hpp
index 1dd3d57ba10b91c3c3a0d77d38dbd753eb9b95ea..7d0312c9999f9c99175ee7c21699ba1a8dd0dd9e 100644
(file)
--- a/
iotjava/iotrmi/C++/IoTRMIObject.hpp
+++ b/
iotjava/iotrmi/C++/IoTRMIObject.hpp
@@
-20,7
+20,7
@@
using namespace std;
using namespace std;
-class IoTRMIObject {
+class IoTRMIObject
final
{
public:
IoTRMIObject(int _port, bool* _bResult);
~IoTRMIObject();
public:
IoTRMIObject(int _port, bool* _bResult);
~IoTRMIObject();
diff --git
a/iotjava/iotrmi/C++/IoTRMITypes.hpp
b/iotjava/iotrmi/C++/IoTRMITypes.hpp
index 629543d89f73dae8c23d676ce8a3061e94938a4e..673479ecd8bf96654e8b6c0fddbbbe863b3045b7 100644
(file)
--- a/
iotjava/iotrmi/C++/IoTRMITypes.hpp
+++ b/
iotjava/iotrmi/C++/IoTRMITypes.hpp
@@
-16,7
+16,7
@@
using namespace std;
using namespace std;
-class IoTRMITypes {
+class IoTRMITypes
final
{
public:
/* Public constants */
public:
/* Public constants */
diff --git
a/iotjava/iotrmi/C++/IoTRMIUtil.hpp
b/iotjava/iotrmi/C++/IoTRMIUtil.hpp
index 74f6d320dee46a7d22da6b0c97b1f77831f8e491..2f18adc5952f4d44ab9dbc0bc3477cb576f22525 100644
(file)
--- a/
iotjava/iotrmi/C++/IoTRMIUtil.hpp
+++ b/
iotjava/iotrmi/C++/IoTRMIUtil.hpp
@@
-27,7
+27,7
@@
using namespace std;
using namespace std;
-class IoTRMIUtil {
+class IoTRMIUtil
final
{
public:
IoTRMIUtil();
public:
IoTRMIUtil();
diff --git
a/iotjava/iotrmi/C++/IoTSocketClient.hpp
b/iotjava/iotrmi/C++/IoTSocketClient.hpp
index b69555fbaff39841076d2abf2295c1ce622e5281..4f5dec540f43c5293d8b41a6f7e89d4d3db10881 100644
(file)
--- a/
iotjava/iotrmi/C++/IoTSocketClient.hpp
+++ b/
iotjava/iotrmi/C++/IoTSocketClient.hpp
@@
-16,7
+16,7
@@
#include "IoTSocket.hpp"
#include "IoTSocket.hpp"
-class IoTSocketClient : public IoTSocket
+class IoTSocketClient
final
: public IoTSocket
{
public:
IoTSocketClient(int iPort, const char* pStrHost, bool bReverse, bool* pResult);
{
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 3d56e70dd286b1f9d21789e6568ce9388230d7f0..47400f92fc69c2b1287ed70aa77d333883c82aec 100644
(file)
--- 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
#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);
{
public:
IoTSocketServer(int iPort, bool* pResult);
diff --git
a/iotjava/iotruntime/cpp/IoTDeviceAddress.hpp
b/iotjava/iotruntime/cpp/IoTDeviceAddress.hpp
index da6a695091e02c4f997d6e07a04ed36ece3ae077..0c54ab02436056266498f18c2d1383aaf8a1f06e 100644
(file)
--- a/
iotjava/iotruntime/cpp/IoTDeviceAddress.hpp
+++ b/
iotjava/iotruntime/cpp/IoTDeviceAddress.hpp
@@
-14,7
+14,7
@@
using namespace std;
// @since 2017-01-09
// @since 2017-01-09
-class IoTDeviceAddress : public IoTAddress
+class IoTDeviceAddress
final
: public IoTAddress
{
public:
{
public:
diff --git
a/iotjava/iotruntime/cpp/IoTUDP.hpp
b/iotjava/iotruntime/cpp/IoTUDP.hpp
index d712d4b3e6e5494b67d846eaf3fbec444bde128a..90e88ab96fab6ceef4eb46f4a87e7233449a4ce3 100644
(file)
--- 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
// @version 1.0
// @since 2017-01-09
-class IoTUDP
+class IoTUDP
final
{
// IoTUDP class properties
private:
{
// IoTUDP class properties
private:
diff --git
a/iotjava/iotruntime/cpp/iotslave/IoTSlave.hpp
b/iotjava/iotruntime/cpp/iotslave/IoTSlave.hpp
index 834580ac4705e234003c8fd46ace77a6874e7803..99d21891395329bb916d98a3310c22d959d371d7 100644
(file)
--- 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*);
typedef void init_t(void*);
-class IoTSlave {
+class IoTSlave
final
{
private:
// Constants
private:
// Constants
diff --git
a/iotjava/iotruntime/cpp/setrelation/IRelation.hpp
b/iotjava/iotruntime/cpp/setrelation/IRelation.hpp
index 5261c30f2282b12797db33afa406358c00448597..17be57218c39fda02bed654fddaa48ac0a0727fa 100644
(file)
--- 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>
* @since 2016-09-06
*/
template <class K,class V>
-class IRelation {
+class IRelation
final
{
private:
unordered_multimap<K,V>* rel;
public:
private:
unordered_multimap<K,V>* rel;
public:
diff --git
a/iotjava/iotruntime/cpp/setrelation/ISet.hpp
b/iotjava/iotruntime/cpp/setrelation/ISet.hpp
index 667b8cea04754a3c374d80a9a9c2b0c3bb60a744..5d8d295333586619d4a4d66619f774fa28f55c8b 100644
(file)
--- 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>
* @since 2016-09-06
*/
template <class T>
-class ISet {
+class ISet
final
{
private:
unordered_set<T>* set;
public:
private:
unordered_set<T>* set;
public:
diff --git
a/iotjava/iotruntime/cpp/setrelation/IoTRelation.hpp
b/iotjava/iotruntime/cpp/setrelation/IoTRelation.hpp
index ad1f8bfcf4c544545453b4baf59793b287fd93e0..a3f6c2191925d5d5e4cf01c7dd994cff6901d61d 100644
(file)
--- 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>
* @since 2016-09-06
*/
template <class K,class V>
-class IoTRelation {
+class IoTRelation
final
{
private:
const unordered_multimap<K,V>* rel;
public:
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 0c45ca8ab42e56071aab85722a05374274dea42d..e2a966d32dc4039de417a542383a91e80d7b6c8b 100644
(file)
--- 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>
* @since 2016-09-06
*/
template <class T>
-class IoTSet {
+class IoTSet
final
{
private:
const unordered_set<T>* set;
public:
private:
const unordered_set<T>* set;
public: