Skip to content

Commit

Permalink
Merge pull request markparticle#15 from markparticle/dev_mark
Browse files Browse the repository at this point in the history
📝 update license
  • Loading branch information
markparticle authored Jun 29, 2020
2 parents b75f3dd + ed980b5 commit 65d08ea
Show file tree
Hide file tree
Showing 24 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion code/buffer/buffer.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-26
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/
#include "buffer.h"

Expand Down
2 changes: 1 addition & 1 deletion code/buffer/buffer.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-26
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/

#ifndef BUFFER_H
Expand Down
2 changes: 1 addition & 1 deletion code/config/config.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* @Author : mark
* @Date : 2020-06-28
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/
2 changes: 1 addition & 1 deletion code/http/httpconn.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-15
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/
#include "httpconn.h"
using namespace std;
Expand Down
2 changes: 1 addition & 1 deletion code/http/httpconn.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-15
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/

#ifndef HTTP_CONN_H
Expand Down
2 changes: 1 addition & 1 deletion code/http/httprequest.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-26
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/
#include "httprequest.h"
using namespace std;
Expand Down
2 changes: 1 addition & 1 deletion code/http/httprequest.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-25
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/
#ifndef HTTP_REQUEST_H
#define HTTP_REQUEST_H
Expand Down
2 changes: 1 addition & 1 deletion code/http/httpresponse.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-27
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/
#include "httpresponse.h"

Expand Down
2 changes: 1 addition & 1 deletion code/http/httpresponse.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-25
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/
#ifndef HTTP_RESPONSE_H
#define HTTP_RESPONSE_H
Expand Down
2 changes: 1 addition & 1 deletion code/log/blockqueue.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-16
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/
#ifndef BLOCKQUEUE_H
#define BLOCKQUEUE_H
Expand Down
2 changes: 1 addition & 1 deletion code/log/log.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-16
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/
#include "log.h"

Expand Down
2 changes: 1 addition & 1 deletion code/log/log.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-16
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/
#ifndef LOG_H
#define LOG_H
Expand Down
2 changes: 1 addition & 1 deletion code/main.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-18
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/
#include <unistd.h>
#include "server/webserver.h"
Expand Down
2 changes: 1 addition & 1 deletion code/pool/sqlconnRAII.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-19
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/

#ifndef SQLCONNRAII_H
Expand Down
2 changes: 1 addition & 1 deletion code/pool/sqlconnpool.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-17
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/

#include "sqlconnpool.h"
Expand Down
2 changes: 1 addition & 1 deletion code/pool/sqlconnpool.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-16
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/
#ifndef SQLCONNPOOL_H
#define SQLCONNPOOL_H
Expand Down
2 changes: 1 addition & 1 deletion code/pool/threadpool.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-15
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/

#ifndef THREADPOOL_H
Expand Down
2 changes: 1 addition & 1 deletion code/server/epoller.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-19
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/

#include "epoller.h"
Expand Down
2 changes: 1 addition & 1 deletion code/server/epoller.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-15
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/
#ifndef EPOLLER_H
#define EPOLLER_H
Expand Down
2 changes: 1 addition & 1 deletion code/server/webserver.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-17
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/

#include "webserver.h"
Expand Down
2 changes: 1 addition & 1 deletion code/server/webserver.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-17
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/
#ifndef WEBSERVER_H
#define WEBSERVER_H
Expand Down
2 changes: 1 addition & 1 deletion code/timer/heaptimer.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-17
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/
#include "heaptimer.h"

Expand Down
2 changes: 1 addition & 1 deletion code/timer/heaptimer.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-17
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/
#ifndef HEAP_TIMER_H
#define HEAP_TIMER_H
Expand Down
2 changes: 1 addition & 1 deletion test/test.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : mark
* @Date : 2020-06-20
* @copyleft GPL 2.0
* @copyleft Apache 2.0
*/
#include "../code/log/log.h"
#include "../code/pool/threadpool.h"
Expand Down

0 comments on commit 65d08ea

Please sign in to comment.