diff options
| author | chai <chaifix@163.com> | 2018-08-08 23:48:17 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2018-08-08 23:48:17 +0800 |
| commit | 3fb2df7ff0b77c7a0075473d8e4db3450191ae6b (patch) | |
| tree | e0855fcbafa30c32534966a66026f69e3bda0e11 | |
| parent | 847e5910abcc2431ad284ef843d482807349682d (diff) | |
*update
| -rw-r--r-- | build/.vs/libjin/v14/.suo | bin | 153600 -> 140288 bytes | |||
| -rw-r--r-- | build/libjin.sln | 8 | ||||
| -rw-r--r-- | libjin/Net/Net.cpp | 1 | ||||
| -rw-r--r-- | test/04Network/main.cpp | 3 |
4 files changed, 10 insertions, 2 deletions
diff --git a/build/.vs/libjin/v14/.suo b/build/.vs/libjin/v14/.suo Binary files differindex 5c85708..8f1ca05 100644 --- a/build/.vs/libjin/v14/.suo +++ b/build/.vs/libjin/v14/.suo diff --git a/build/libjin.sln b/build/libjin.sln index 7bdc3c3..e0eaf6d 100644 --- a/build/libjin.sln +++ b/build/libjin.sln @@ -13,6 +13,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "03Thread", "03Thread\03Thre EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "04Network", "04Network\04Network.vcxproj", "{85071432-24B6-46D4-98D8-DAA63183093C}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{D401F737-EEF5-4EA3-8CEA-A15523AE68AD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -65,4 +67,10 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {F1B984AA-F46D-46C9-9A5A-7606A30E0599} = {D401F737-EEF5-4EA3-8CEA-A15523AE68AD} + {A2D75980-B0AC-498C-B507-4727B4A38E83} = {D401F737-EEF5-4EA3-8CEA-A15523AE68AD} + {0E49D105-2032-4825-9FA1-54B1B94E3655} = {D401F737-EEF5-4EA3-8CEA-A15523AE68AD} + {85071432-24B6-46D4-98D8-DAA63183093C} = {D401F737-EEF5-4EA3-8CEA-A15523AE68AD} + EndGlobalSection EndGlobal diff --git a/libjin/Net/Net.cpp b/libjin/Net/Net.cpp index db39be7..0545b6c 100644 --- a/libjin/Net/Net.cpp +++ b/libjin/Net/Net.cpp @@ -17,7 +17,6 @@ namespace net void Net::quitSystem() { - } } diff --git a/test/04Network/main.cpp b/test/04Network/main.cpp index 6db72ab..571708f 100644 --- a/test/04Network/main.cpp +++ b/test/04Network/main.cpp @@ -67,8 +67,9 @@ int main(int argc, char* argv[]) wndSetting.resizable = true; wnd->init(&wndSetting); - Net::get()->init(nullptr); + Net::get()->init(); + // server Socket socket(SocketType::TCP, 6438); Thread t("Receive Network Data", netWorkThread); |