From ce2bef0e75d8103fe697c3fe13f8bb964ca7c3e7 Mon Sep 17 00:00:00 2001 From: Saturneric Date: Mon, 25 Feb 2019 08:04:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 调成以适应在VS环境下的开发 --- .gitattributes | 63 ++++++++++++++++++++++++++++++++++++++++++++++ .gitignore | 1 + include/cproj.h | 1 - include/type.h | 1 + src/controller.cpp | 2 +- src/test.cpp | 2 +- 6 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..1ff0c42 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,63 @@ +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto + +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# diff behavior for common document formats +# +# Convert binary document formats to text before diffing them. This feature +# is only available from the command line. Turn it on by uncommenting the +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore index d0a4c08..0d1da1d 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ PCS *.pbxproj *.pbxproj Net.xcodeproj/project.pbxproj +Net/ diff --git a/include/cproj.h b/include/cproj.h index e1169a5..15f9b83 100644 --- a/include/cproj.h +++ b/include/cproj.h @@ -267,7 +267,6 @@ class Map: public Cpt{ //proj文件管理类 class Proj:public setting_file{ - friend Proj; // 计算工程所在的目录 string proj_path; // 计算工程描述文件名 diff --git a/include/type.h b/include/type.h index 16352fc..f33b0ba 100644 --- a/include/type.h +++ b/include/type.h @@ -15,6 +15,7 @@ #include #include #include +#include #include #include diff --git a/src/controller.cpp b/src/controller.cpp index 8f49d13..97977c6 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -440,7 +440,7 @@ int client(string instruct, vector &configs, vector &lconfigs, v while (1) { char cmd[1024]; printf(">"); - gets(cmd); + scanf("%s", cmd); string cmdstr = cmd; if(cmdstr == "send"){ diff --git a/src/test.cpp b/src/test.cpp index 38e0179..5571cc3 100644 --- a/src/test.cpp +++ b/src/test.cpp @@ -21,7 +21,7 @@ int main(int argc, char *argv[]) while (1) { nclt.NewRequest(&preq, "127.0.0.1", 9048, "client-square request", "request for public key"); - nclt.NewRequestListener(preq, 10, getSQEPublicKey); + //nclt.NewRequestListener(preq, 10, getSQEPublicKey); sleep(10000); }