8000 Recreated project settings to try and resolve std::string errors. · randomcoding/PSAI-MessageRelay@9e95514 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9e95514

Browse files
randomcoderrandomcoder
committed
Recreated project settings to try and resolve std::string errors.
1 parent a5cb9ea commit 9e95514

File tree

8 files changed

+287
-657
lines changed

8 files changed

+287
-657
lines changed

‎.cproject

Lines changed: 211 additions & 617 deletions 10000
Large diffs are not rendered by default.

‎.project

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
33
<name>PsaiMessageRelay</name>
4-
<comment>The Message relay component for the PSAI Project.</comment>
4+
<comment></comment>
55
<projects>
66
</projects>
77
<buildSpec>
@@ -31,7 +31,7 @@
3131
</dictionary>
3232
<dictionary>
3333
<key>org.eclipse.cdt.make.core.buildLocation</key>
34-
<value>${workspace_loc:/PsaiMessageRedirector/}</value>
34+
<value>${workspace_loc:/PsaiMessageRelay/Release}</value>
3535
</dictionary>
3636
<dictionary>
3737
<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
@@ -55,7 +55,7 @@
5555
</dictionary>
5656
<dictionary>
5757
<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
58-
<value>-q -sCRYSTAL.DIR=${CRYSTAL_BASE_DIR} -sCAL3D.DIR=${CAL3D_BASE_DIR} -sPS.DIR=${PS_BASE_DIR} -sGTEST.DIR=${GTEST_BASE_DIR} all</value>
58+
<value>-aq -sCRYSTAL.DIR=${CS_DIR} -sCAL3D.DIR=${CAL3D_DIR} -sPS.DIR=${PS_DIR} -sGTEST.DIR=${GTEST_BASE_DIR}</value>
5959
</dictionary>
6060
<dictionary>
6161
<key>org.eclipse.cdt.make.core.stopOnError</key>
@@ -69,14 +69,15 @@
6969
</buildCommand>
7070
<buildCommand>
7171
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
72+
<triggers>full,incremental,</triggers>
7273
<arguments>
7374
</arguments>
7475
</buildCommand>
7576
</buildSpec>
7677
<natures>
78+
<nature>org.eclipse.cdt.core.cnature</nature>
7779
<nature>org.eclipse.cdt.core.ccnature</nature>
78-
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
7980
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
80-
<nature>org.eclipse.cdt.core.cnature</nature>
81+
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
8182
</natures>
8283
</projectDescription>

‎.settings/org.eclipse.cdt.codan.core.prefs

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
#Thu Sep 08 16:03:09 BST 2011
2+
eclipse.preferences.version=1
3+
org.eclipse.cdt.codan.checkers.errnoreturn=Warning
4+
org.eclipse.cdt.codan.checkers.errnoreturn.params={implicit\=>false}
5+
org.eclipse.cdt.codan.checkers.errreturnvalue=Error
6+
org.eclipse.cdt.codan.checkers.errreturnvalue.params={}
7+
org.eclipse.cdt.codan.checkers.noreturn=Error
8+
org.eclipse.cdt.codan.checkers.noreturn.params={implicit\=>false}
9+
org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=Error
10+
org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
11+
org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=Error
12+
org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
13+
org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=Warning
14+
org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={}
15+
org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=Error
16+
org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={}
17+
org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=Warning
18+
org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false}
19+
org.eclipse.cdt.codan.internal.checkers.CatchByReference=Warning
20+
org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={unknown\=>false,exceptions\=>()}
21+
org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=Error
22+
org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
23+
org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=Error
24+
org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
25+
org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=Error
26+
org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
27+
org.eclipse.cdt.codan.internal.checkers.InvalidArguments=Error
28+
org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
29+
org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=Error
30+
org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
31+
org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=Error
32+
org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
33+
org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=Error
34+
org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
35+
org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=Error
36+
org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
37+
org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
38+
org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
39+
org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=Warning
40+
org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={}
41+
org.eclipse.cdt.codan.internal.checkers.OverloadProblem=Error
42+
org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
43+
org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=Error
44+
org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
45+
org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=Error
46+
org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
47+
org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
48+
org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={}
49+
org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
50+
org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={}
51+
org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=Warning
52+
org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={macro\=>true,exceptions\=>()}
53+
org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=Warning
54+
org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={paramNot\=>false}
55+
org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=Warning
56+
org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={else\=>false,afterelse\=>false}
57+
org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=Error
58+
org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
59+
org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=Warning
60+
org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={}
61+
org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=Warning
62+
org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={}
63+
org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=Warning
64+
org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={exceptions\=>("@(\#)","$Id")}
65+
org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=Error
66+
org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}

‎.settings/org.eclipse.cdt.core.prefs

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎.settings/org.eclipse.mylyn.tasks.ui.prefs

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/message/PsaiMessageRedirector.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
#include <stdio.h>
9-
#include <string.h>
9+
#include <string>
1010

1111
#include <psconfig.h>
1212
#include <psengine.h>

‎src/message/PsaiMessageRedirector.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ class psViewItemDescription;
5252
class psViewItemUpdate;
5353
class psEquipmentMessage;
5454
class PsaiXmlGenerator;
55-
class NetBase::AccessPointers;
5655

56+
#include <net/netbase.h>
5757

5858
class PsaiMessageRedirector: public psClientNetSubscriber
5959
{

‎tests/XmlGeneratorTests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ class XmlGeneratorTest: public testing::Test
143143
psLinearMovement* linearMovement = new psLinearMovement(objectRegistry);
144144
linearMovement->SetPathSector(XmlGeneratorTest::sector.c_str());
145145

146-
return psLinearMovement;
146+
return linearMovement;
147147
}
148148

149149
String getXmlStringStartForMessageType(String messageType)
@@ -483,7 +483,7 @@ TEST_F(XmlGeneratorTest, testChatMessageToXml)
483483

484484
String chatXml = getGenerator().toXml(msg);
485485

486-
ASSERT_STREQ(getExpectedXmlStringForChatMessageToXml().c_str(), chatXml.c_str())<< "Xml generated from psChatMessage was not the same as expected";
486+
ASSERT_STREQ(getExpectedXmlStringForChatMessageToXml().c_str(), chatXml.c_str());
487487
}
488488

< 3AFC code>489489
TEST_F(XmlGeneratorTest, testPlaySoundMessageToXml)

0 commit comments

Comments
 (0)
0