调整

调成以适应在VS环境下的开发

.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

.gitignore

@@ -41,3 +41,4 @@ PCS
 *.pbxproj
 *.pbxproj
 Net.xcodeproj/project.pbxproj
+Net/

include/cproj.h

@@ -267,7 +267,6 @@ class Map: public Cpt{
 
 //proj文件管理类
 class Proj:public setting_file{
-    friend Proj;
 //    计算工程所在的目录
     string proj_path;
 //    计算工程描述文件名

include/type.h

@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <algorithm>
 #include <vector>

src/controller.cpp

@@ -440,7 +440,7 @@ int client(string instruct, vector<string> &configs, vector<string> &lconfigs, v
             while (1) {
                 char cmd[1024];
                 printf(">");
-                gets(cmd);
+				scanf("%s", cmd);
                 string cmdstr = cmd;
                 
                 if(cmdstr == "send"){

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);
         }