2
0
Эх сурвалжийг харах

Moved message_variant and cleaned up message.hpp include

Paul-Louis Ageneau 3 жил өмнө
parent
commit
482fec2a76

+ 0 - 1
include/rtc/channel.hpp

@@ -20,7 +20,6 @@
 #define RTC_CHANNEL_H
 
 #include "common.hpp"
-#include "message.hpp"
 
 #include <atomic>
 #include <functional>

+ 2 - 1
include/rtc/common.hpp

@@ -66,7 +66,8 @@ using std::variant;
 using std::weak_ptr;
 
 using binary = std::vector<byte>;
-using binary_ptr = std::shared_ptr<binary>;
+using binary_ptr = shared_ptr<binary>;
+using message_variant = variant<binary, string>;
 
 using std::int16_t;
 using std::int32_t;

+ 0 - 1
include/rtc/configuration.hpp

@@ -20,7 +20,6 @@
 #define RTC_ICE_CONFIGURATION_H
 
 #include "common.hpp"
-#include "message.hpp"
 
 #include <vector>
 

+ 0 - 1
include/rtc/datachannel.hpp

@@ -21,7 +21,6 @@
 
 #include "channel.hpp"
 #include "common.hpp"
-#include "message.hpp"
 #include "reliability.hpp"
 
 #include <type_traits>

+ 0 - 1
include/rtc/message.hpp

@@ -46,7 +46,6 @@ struct RTC_CPP_EXPORT Message : binary {
 
 using message_ptr = shared_ptr<Message>;
 using message_callback = std::function<void(message_ptr message)>;
-using message_variant = variant<binary, string>;
 
 inline size_t message_size_func(const message_ptr &m) {
 	return m->type == Message::Binary || m->type == Message::String ? m->size() : 0;

+ 0 - 1
include/rtc/peerconnection.hpp

@@ -24,7 +24,6 @@
 #include "configuration.hpp"
 #include "datachannel.hpp"
 #include "description.hpp"
-#include "message.hpp"
 #include "reliability.hpp"
 #include "track.hpp"
 

+ 0 - 1
include/rtc/track.hpp

@@ -23,7 +23,6 @@
 #include "common.hpp"
 #include "description.hpp"
 #include "mediahandler.hpp"
-#include "message.hpp"
 
 namespace rtc {
 

+ 0 - 1
include/rtc/websocket.hpp

@@ -23,7 +23,6 @@
 
 #include "channel.hpp"
 #include "common.hpp"
-#include "message.hpp"
 
 namespace rtc {