mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-04 18:11:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (#600)

Browse Source 
* General Code Cleanup
 * Add check for TABs to check_style_guide.py
 * Removing warnings
This commit is contained in:
Alexander Bock
2018-04-19 13:27:15 -04:00
committed by GitHub
parent 12db1dd0c2
commit 4041bbb935
151 changed files with 1229 additions and 1033 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/server/include/topic.h
+9 -7
View File
@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2017 *
* Copyright (c) 2014-2018 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef OPENSPACE_MODULES_SERVER__TOPIC_H
#define OPENSPACE_MODULES_SERVER__TOPIC_H
#ifndef __OPENSPACE_MODULE_SERVER___TOPIC___H__
#define __OPENSPACE_MODULE_SERVER___TOPIC___H__
#include <ext/json/json.hpp>
@@ -34,10 +34,12 @@ class Connection;
class Topic {
public:
Topic() {};
virtual ~Topic() {};
virtual ~Topic() = default;
void initialize(Connection* connection, size_t topicId);
nlohmann::json wrappedPayload(const nlohmann::json &payload) const;
nlohmann::json wrappedError(std::string message = "Could not complete request.", int code = 500);
nlohmann::json wrappedError(std::string message = "Could not complete request.",
int code = 500);
virtual void handleJson(nlohmann::json json) = 0;
virtual bool isDone() = 0;
@@ -54,6 +56,6 @@ public:
bool isDone() { return false; }
};
}
} // namespace openspace
#endif //OPENSPACE_MODULES_SERVER__TOPIC_H
#endif // __OPENSPACE_MODULE_SERVER___TOPIC___H__