diff --git a/.gitignore b/.gitignore
index 37a30422..1ba8589f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,8 @@ TestSingle.tiny.xml
*.gcda
.*.swp
*.map
+*.sdf
+*.opensdf
demo-master-cpp
demo-slave-cpp
@@ -76,3 +78,5 @@ config.status
libtool
*target*
+
+
diff --git a/APL/APL.vcxproj b/APL/APL.vcxproj
new file mode 100755
index 00000000..ff98135a
--- /dev/null
+++ b/APL/APL.vcxproj
@@ -0,0 +1,280 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ {761218B0-F2B7-42DA-9C9B-413FA34886DF}
+ DNPStack
+ Win32Proj
+
+
+
+ StaticLibrary
+ MultiByte
+
+
+ StaticLibrary
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(Configuration)\
+ $(Configuration)\
+
+
+
+ Disabled
+ %(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
+ true
+ Sync
+ Default
+ MultiThreadedDebugDLL
+ false
+ Precise
+
+
+ Level3
+ EditAndContinue
+ 4355;4503;4180;%(DisableSpecificWarnings)
+
+
+ $(OutDir)$(ProjectName).lib
+
+
+
+
+ %(AdditionalIncludeDirectories)
+ __USE_W32_SOCKETS; WIN32;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+
+ Level3
+ ProgramDatabase
+
+
+ $(OutDir)DNPStack.lib
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/APL/APL.vcxproj.filters b/APL/APL.vcxproj.filters
new file mode 100755
index 00000000..fa0a80ea
--- /dev/null
+++ b/APL/APL.vcxproj.filters
@@ -0,0 +1,625 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {6e4a5276-1d16-4fdb-92a3-abf27903b49b}
+
+
+ {3e52ea85-f2f2-4ed8-8897-ec9635d62c61}
+
+
+ {4b1ebd7a-f2a8-4a46-8042-4a0870032600}
+
+
+ {cd76dbe0-c1e7-4754-b2c1-3a536de2452c}
+
+
+ {c80f9f0a-e6c7-4d85-bb9f-c95fec84e5ac}
+
+
+ {bc24a9a3-e451-4e70-b671-ef69c6f081e3}
+
+
+ {22187097-df94-4f84-b2e2-996e606d39c9}
+
+
+ {ecad84cd-f0bd-4fde-9f24-54ac77170e89}
+
+
+ {0a55ca71-2737-4f7d-8ecb-b158ca193f8b}
+
+
+ {7e7b6df6-a12d-44ed-a021-50c476d32703}
+
+
+ {fd80c12e-1fc7-4597-b148-f4ff134f1a08}
+
+
+ {6e44639d-2647-4205-87a7-b0dc79048a5e}
+
+
+ {fec27d31-413d-4167-ac60-dc79dfc47211}
+
+
+ {3999097e-70bd-414e-b1ad-82f56dfbda60}
+
+
+ {9edc7dba-39bc-43f8-9b07-c494fba3cbeb}
+
+
+ {124938b3-f425-4610-aea8-eadaf2f5abdc}
+
+
+ {5d88faf9-8053-4e71-8924-e1540b16beb4}
+
+
+ {01c1c60f-7bdf-4214-bb0e-029ff485ccd3}
+
+
+ {e77a0db3-00d2-411f-98dc-d77593a75b95}
+
+
+ {634ac8ba-0f99-4f91-b47b-6f1782bb7f3c}
+
+
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer\Base
+
+
+ Source Files\PhysicalLayer\Base
+
+
+ Source Files\PhysicalLayer\Base
+
+
+ Source Files\PhysicalLayer\Base
+
+
+ Source Files\PhysicalLayer\Base
+
+
+ Source Files\PhysicalLayer\Factory
+
+
+ Source Files\PhysicalLayer\Factory
+
+
+ Source Files\PhysicalLayer\Serial
+
+
+ Source Files\PhysicalLayer\Serial
+
+
+ Source Files\PhysicalLayer\Serial
+
+
+ Source Files\PhysicalLayer\TCP
+
+
+ Source Files\PhysicalLayer\TCP
+
+
+ Source Files\PhysicalLayer\TCP
+
+
+ Source Files\PhysicalLayer\Monitor
+
+
+ Source Files\PhysicalLayer\Monitor
+
+
+ Source Files\PhysicalLayer\Monitor
+
+
+ Source Files\PhysicalLayer\Monitor
+
+
+ Source Files\Log
+
+
+ Source Files\Log
+
+
+ Source Files\Log
+
+
+ Source Files\Log
+
+
+ Source Files\Log
+
+
+ Source Files\Log
+
+
+ Source Files\Log
+
+
+ Source Files\Log
+
+
+ Source Files\Log
+
+
+ Source Files\Log
+
+
+ Source Files\Log
+
+
+ Source Files\Log
+
+
+ Source Files\Threading
+
+
+ Source Files\Threading
+
+
+ Source Files\Threading
+
+
+ Source Files\Threading
+
+
+ Source Files\Threading
+
+
+ Source Files\Threading
+
+
+ Source Files\Threading
+
+
+ Source Files\Threading
+
+
+ Source Files\Threading
+
+
+ Source Files\Threading
+
+
+ Source Files\Threading\Locks
+
+
+ Source Files\Threading\Locks
+
+
+ Source Files\Threading\Locks
+
+
+ Source Files\Threading\Locks
+
+
+ Source Files\Threading\Locks
+
+
+ Source Files\Threading\Locks
+
+
+ Source Files\Threading\Locks
+
+
+ Source Files\Threading\Locks
+
+
+ Source Files\Threading\Locks
+
+
+ Source Files\Common
+
+
+ Source Files\Common
+
+
+ Source Files\Common
+
+
+ Source Files\Common
+
+
+ Source Files\Common
+
+
+ Source Files\Common
+
+
+ Source Files\Common
+
+
+ Source Files\Common
+
+
+ Source Files\Common
+
+
+ Source Files\Common
+
+
+ Source Files\Common
+
+
+ Source Files\Time
+
+
+ Source Files\Time
+
+
+ Source Files\Time
+
+
+ Source Files\Time
+
+
+ Source Files\Time
+
+
+ Source Files\Time
+
+
+ Source Files\Time
+
+
+ Source Files\Protocol
+
+
+ Source Files\Protocol
+
+
+ Source Files\Protocol
+
+
+ Source Files\Protocol\Packing
+
+
+ Source Files\Protocol\Packing
+
+
+ Source Files\Protocol\Interfaces
+
+
+ Source Files\Protocol\Buffers
+
+
+ Source Files\Protocol\Buffers
+
+
+ Source Files\Protocol\Buffers
+
+
+ Source Files\Protocol\CRC
+
+
+ Source Files\Timers
+
+
+ Source Files\Timers
+
+
+ Source Files\Timers
+
+
+ Source Files\Timers
+
+
+ Source Files\Timers
+
+
+ Source Files\Timers
+
+
+ Source Files\Timers
+
+
+ Source Files\Timers
+
+
+ Source Files\AsyncTasks
+
+
+ Source Files\AsyncTasks
+
+
+ Source Files\AsyncTasks
+
+
+ Source Files\AsyncTasks
+
+
+ Source Files\AsyncTasks
+
+
+ Source Files\AsyncTasks
+
+
+ Source Files\AsyncTasks
+
+
+ Source Files\AsyncTasks
+
+
+ Source Files\Data
+
+
+ Source Files\Data
+
+
+ Source Files\Data
+
+
+ Source Files\Data
+
+
+ Source Files\Data
+
+
+ Source Files\Data
+
+
+ Source Files\Data
+
+
+ Source Files\Data
+
+
+ Source Files\Data
+
+
+ Source Files\Data
+
+
+ Source Files\Data
+
+
+ Source Files\Data
+
+
+ Source Files\Data
+
+
+ Source Files\Data
+
+
+ Source Files\Function
+
+
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer\Base
+
+
+ Source Files\PhysicalLayer\Base
+
+
+ Source Files\PhysicalLayer\Base
+
+
+ Source Files\PhysicalLayer\Factory
+
+
+ Source Files\PhysicalLayer\Serial
+
+
+ Source Files\PhysicalLayer\Serial
+
+
+ Source Files\PhysicalLayer\TCP
+
+
+ Source Files\PhysicalLayer\TCP
+
+
+ Source Files\PhysicalLayer\TCP
+
+
+ Source Files\PhysicalLayer\Monitor
+
+
+ Source Files\PhysicalLayer\Monitor
+
+
+ Source Files\PhysicalLayer\Monitor
+
+
+ Source Files\Log
+
+
+ Source Files\Log
+
+
+ Source Files\Log
+
+
+ Source Files\Log
+
+
+ Source Files\Log
+
+
+ Source Files\Log
+
+
+ Source Files\Log
+
+
+ Source Files\Log
+
+
+ Source Files\Log
+
+
+ Source Files\Threading
+
+
+ Source Files\Threading
+
+
+ Source Files\Threading
+
+
+ Source Files\Threading
+
+
+ Source Files\Threading\Locks
+
+
+ Source Files\Threading\Locks
+
+
+ Source Files\Threading\Locks
+
+
+ Source Files\Common
+
+
+ Source Files\Common
+
+
+ Source Files\Common
+
+
+ Source Files\Time
+
+
+ Source Files\Time
+
+
+ Source Files\Time
+
+
+ Source Files\Time
+
+
+ Source Files\Time
+
+
+ Source Files\Protocol
+
+
+ Source Files\Protocol
+
+
+ Source Files\Protocol
+
+
+ Source Files\Protocol\Packing
+
+
+ Source Files\Protocol\Interfaces
+
+
+ Source Files\Protocol\Buffers
+
+
+ Source Files\Protocol\Buffers
+
+
+ Source Files\Protocol\Buffers
+
+
+ Source Files\Protocol\CRC
+
+
+ Source Files\Timers
+
+
+ Source Files\Timers
+
+
+ Source Files\Timers
+
+
+ Source Files\Timers
+
+
+ Source Files\Timers
+
+
+ Source Files\Timers
+
+
+ Source Files\Timers
+
+
+ Source Files\AsyncTasks
+
+
+ Source Files\AsyncTasks
+
+
+ Source Files\AsyncTasks
+
+
+ Source Files\AsyncTasks
+
+
+ Source Files\AsyncTasks
+
+
+ Source Files\AsyncTasks
+
+
+ Source Files\AsyncTasks
+
+
+ Source Files\Data
+
+
+ Source Files\Data
+
+
+ Source Files\Data
+
+
+ Source Files\Data
+
+
+ Source Files\Data
+
+
+ Source Files\Data
+
+
+ Source Files\Data
+
+
+ Source Files\Data
+
+
+
\ No newline at end of file
diff --git a/APL/PhysicalLayerAsyncSerial.cpp b/APL/PhysicalLayerAsyncSerial.cpp
index 60454224..bcf1dea3 100644
--- a/APL/PhysicalLayerAsyncSerial.cpp
+++ b/APL/PhysicalLayerAsyncSerial.cpp
@@ -60,7 +60,7 @@ void PhysicalLayerAsyncSerial::DoOpen()
//use post to simulate an async open operation
if(!ec) asio_serial::Configure(mSettings, mPort, ec);
- mpService->post(bind(&PhysicalLayerAsyncSerial::OnOpenCallback, this, ec));
+ mpService->post(boost::bind(&PhysicalLayerAsyncSerial::OnOpenCallback, this, ec));
}
void PhysicalLayerAsyncSerial::DoClose()
diff --git a/APLTestTools/APLTestTools.vcxproj b/APLTestTools/APLTestTools.vcxproj
new file mode 100755
index 00000000..e83f689d
--- /dev/null
+++ b/APLTestTools/APLTestTools.vcxproj
@@ -0,0 +1,122 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ {41D4B22B-F06E-4230-9AA8-3BFF096CC710}
+ PSITestTools
+
+
+
+ StaticLibrary
+ MultiByte
+ true
+
+
+ StaticLibrary
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(Configuration)\
+ $(Configuration)\
+
+
+
+ Disabled
+ %(AdditionalIncludeDirectories)
+ WIN32;_LIB;_DEBUG;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+ Level3
+ EditAndContinue
+
+
+
+
+ %(AdditionalIncludeDirectories)
+ WIN32;_LIB;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+ Level3
+ ProgramDatabase
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/APLTestTools/APLTestTools.vcxproj.filters b/APLTestTools/APLTestTools.vcxproj.filters
new file mode 100755
index 00000000..737d93b6
--- /dev/null
+++ b/APLTestTools/APLTestTools.vcxproj.filters
@@ -0,0 +1,157 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {8af896e6-3b4c-4b10-9123-dfbe903bf1ce}
+
+
+ {2ccc446f-d159-4d21-b346-c0910374678b}
+
+
+ {3ef8c9d5-079e-43d1-9297-97d24615c465}
+
+
+ {3fc737ee-071a-476c-bb89-b290e91cd15c}
+
+
+ {6e8a69a8-5ce5-47d7-b2c4-a1a62495af1c}
+
+
+ {6c1743f9-ef75-4b14-a287-f53871ddedf7}
+
+
+
+
+ Source Files
+
+
+ Source Files\AsyncProtocol
+
+
+ Source Files\AsyncProtocol
+
+
+ Source Files\AsyncProtocol
+
+
+ Source Files\AsyncProtocol
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\Timers
+
+
+ Source Files\LogHelpers
+
+
+ Source Files\LogHelpers
+
+
+ Source Files\LogHelpers
+
+
+ Source Files\DataMocks
+
+
+ Source Files\DataMocks
+
+
+ Source Files\DataMocks
+
+
+ Source Files\DataMocks
+
+
+ Source Files\GenericTestObjects
+
+
+ Source Files\GenericTestObjects
+
+
+ Source Files\GenericTestObjects
+
+
+
+
+ Source Files\AsyncProtocol
+
+
+ Source Files\AsyncProtocol
+
+
+ Source Files\AsyncProtocol
+
+
+ Source Files\AsyncProtocol
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\Timers
+
+
+ Source Files\LogHelpers
+
+
+ Source Files\DataMocks
+
+
+ Source Files\GenericTestObjects
+
+
+
\ No newline at end of file
diff --git a/APLXML/APLXML.vcxproj b/APLXML/APLXML.vcxproj
new file mode 100755
index 00000000..3db29bc8
--- /dev/null
+++ b/APLXML/APLXML.vcxproj
@@ -0,0 +1,91 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ {91323793-8551-4484-83DC-21AC9C18BD2E}
+ PSIXML
+ Win32Proj
+
+
+
+ StaticLibrary
+ Unicode
+ true
+
+
+ StaticLibrary
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ Disabled
+ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ EditAndContinue
+
+
+
+
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+
+ Level3
+ ProgramDatabase
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/APLXML/APLXML.vcxproj.filters b/APLXML/APLXML.vcxproj.filters
new file mode 100755
index 00000000..9867c3fb
--- /dev/null
+++ b/APLXML/APLXML.vcxproj.filters
@@ -0,0 +1,49 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
\ No newline at end of file
diff --git a/CSToCppXMLBinder/CSToCppXMLBinder.csproj b/CSToCppXMLBinder/CSToCppXMLBinder.csproj
index da4abb78..d4784b9b 100755
--- a/CSToCppXMLBinder/CSToCppXMLBinder.csproj
+++ b/CSToCppXMLBinder/CSToCppXMLBinder.csproj
@@ -1,4 +1,5 @@
-
+
+
Debug
AnyCPU
@@ -9,6 +10,11 @@
Properties
CSToCppXMLBinder
CSToCppXMLBinder
+ v2.0
+
+
+ 2.0
+
true
diff --git a/DNP.sln b/DNP.sln
index 7cbb27af..d7d8c671 100755
--- a/DNP.sln
+++ b/DNP.sln
@@ -1,37 +1,35 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSToCppXMLBinder", "CSToCppXMLBinder\CSToCppXMLBinder.csproj", "{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DNP3", "DNP3\DNP3.vcproj", "{E053E7ED-F462-4DE0-8D69-6D97045FFB25}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DNP3", "DNP3\DNP3.vcxproj", "{E053E7ED-F462-4DE0-8D69-6D97045FFB25}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DNP3Test", "DNP3Test\DNP3Test.vcproj", "{893D4C53-0729-480D-8F40-75E7139224DF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DNP3Test", "DNP3Test\DNP3Test.vcxproj", "{893D4C53-0729-480D-8F40-75E7139224DF}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSet", "TestSet\TestSet.vcproj", "{DE526D6F-CE9C-47E4-8783-12344FDBF581}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSet", "TestSet\TestSet.vcxproj", "{DE526D6F-CE9C-47E4-8783-12344FDBF581}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DNP3XML", "DNP3XML\DNP3XML.vcproj", "{547D1F36-8A34-4C48-B16D-9C3D60EFA505}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DNP3XML", "DNP3XML\DNP3XML.vcxproj", "{547D1F36-8A34-4C48-B16D-9C3D60EFA505}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml", "tinyxml\tinyxml.vcproj", "{220D8EB8-6C0C-416C-8BBB-F554431C29CD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml", "tinyxml\tinyxml.vcxproj", "{220D8EB8-6C0C-416C-8BBB-F554431C29CD}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Terminal", "Terminal\Terminal.vcproj", "{FB9D36B0-102F-4E11-BF45-C80A3709D098}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Terminal", "Terminal\Terminal.vcxproj", "{FB9D36B0-102F-4E11-BF45-C80A3709D098}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalTest", "TerminalTest\TerminalTest.vcproj", "{6AB7896D-E692-4075-9396-9B1C7AE6F704}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalTest", "TerminalTest\TerminalTest.vcxproj", "{6AB7896D-E692-4075-9396-9B1C7AE6F704}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APL", "APL\APL.vcproj", "{761218B0-F2B7-42DA-9C9B-413FA34886DF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APL", "APL\APL.vcxproj", "{761218B0-F2B7-42DA-9C9B-413FA34886DF}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APLTestTools", "APLTestTools\APLTestTools.vcproj", "{41D4B22B-F06E-4230-9AA8-3BFF096CC710}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APLTestTools", "APLTestTools\APLTestTools.vcxproj", "{41D4B22B-F06E-4230-9AA8-3BFF096CC710}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APLTest", "TestAPL\TestAPL.vcproj", "{9BCA9E3F-3974-4B32-883D-9115160E4051}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APLTest", "TestAPL\TestAPL.vcxproj", "{9BCA9E3F-3974-4B32-883D-9115160E4051}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XMLBindings", "XMLBindings\XMLBindings.vcproj", "{F1EB4FCC-3299-4574-AEA2-19B61F35966D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XMLBindings", "XMLBindings\XMLBindings.vcxproj", "{F1EB4FCC-3299-4574-AEA2-19B61F35966D}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APLXML", "APLXML\APLXML.vcproj", "{91323793-8551-4484-83DC-21AC9C18BD2E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APLXML", "APLXML\APLXML.vcxproj", "{91323793-8551-4484-83DC-21AC9C18BD2E}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DNP3Java", "DNP3Java\DNP3Java.vcproj", "{ADDD6B3A-FFAE-4534-B27B-2795CEE8D2AD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DNP3Java", "DNP3Java\DNP3Java.vcxproj", "{ADDD6B3A-FFAE-4534-B27B-2795CEE8D2AD}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "TestSetInstaller", "TestSetInstaller\TestSetInstaller.vdproj", "{9FAD9888-9441-4ACF-8750-90AFEA9F938A}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SlaveDemo", "SlaveDemo\SlaveDemo.vcproj", "{9C4EC600-DE0F-4042-BE12-F4BAF605A49C}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -188,16 +186,6 @@ Global
{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Release|Mixed Platforms.ActiveCfg = Release
{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Release|Mixed Platforms.Build.0 = Release
{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Release|Win32.ActiveCfg = Release
- {9C4EC600-DE0F-4042-BE12-F4BAF605A49C}.Debug|Any CPU.ActiveCfg = Debug|Win32
- {9C4EC600-DE0F-4042-BE12-F4BAF605A49C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
- {9C4EC600-DE0F-4042-BE12-F4BAF605A49C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
- {9C4EC600-DE0F-4042-BE12-F4BAF605A49C}.Debug|Win32.ActiveCfg = Debug|Win32
- {9C4EC600-DE0F-4042-BE12-F4BAF605A49C}.Debug|Win32.Build.0 = Debug|Win32
- {9C4EC600-DE0F-4042-BE12-F4BAF605A49C}.Release|Any CPU.ActiveCfg = Release|Win32
- {9C4EC600-DE0F-4042-BE12-F4BAF605A49C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
- {9C4EC600-DE0F-4042-BE12-F4BAF605A49C}.Release|Mixed Platforms.Build.0 = Release|Win32
- {9C4EC600-DE0F-4042-BE12-F4BAF605A49C}.Release|Win32.ActiveCfg = Release|Win32
- {9C4EC600-DE0F-4042-BE12-F4BAF605A49C}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/DNP3/DNP3.vcxproj b/DNP3/DNP3.vcxproj
new file mode 100755
index 00000000..22a2461b
--- /dev/null
+++ b/DNP3/DNP3.vcxproj
@@ -0,0 +1,244 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ {E053E7ED-F462-4DE0-8D69-6D97045FFB25}
+ DNP3
+
+
+
+ StaticLibrary
+ MultiByte
+ true
+
+
+ StaticLibrary
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ Disabled
+ %(AdditionalIncludeDirectories)
+ WIN32;_LIB;_DEBUG;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+ Level3
+ EditAndContinue
+ 4355;%(DisableSpecificWarnings)
+
+
+
+
+ %(AdditionalIncludeDirectories)
+ WIN32;_LIB;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+ Level3
+ ProgramDatabase
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/DNP3/DNP3.vcxproj.filters b/DNP3/DNP3.vcxproj.filters
new file mode 100755
index 00000000..58775289
--- /dev/null
+++ b/DNP3/DNP3.vcxproj.filters
@@ -0,0 +1,544 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {91042256-4cd5-46a2-a7d1-cadf88c05036}
+
+
+ {112b3b38-e895-4ca2-b1bc-c4dfdd0caf91}
+
+
+ {7bc20cf1-5c7c-44a0-ade4-5dfbd84ffb08}
+
+
+ {b0bbe391-a844-4f1f-9a56-518895ad23e3}
+
+
+ {c8fb69f2-73a0-4502-a21f-707097842ef1}
+
+
+ {c3ebe0f5-66e8-48ed-8c6f-222e803381fd}
+
+
+ {8c831d4d-32ab-4fc9-b4c2-f6de6602b5d8}
+
+
+ {e146fbdd-36fa-4f22-b83b-8cb80cff40c6}
+
+
+ {597c2fdd-4e6e-4109-8549-a165e24289da}
+
+
+ {61248d12-f5ab-4e3f-b599-e825e4d42ae8}
+
+
+ {7523e388-3277-4852-84ca-f262dcdf48a9}
+
+
+ {87e1e548-733a-425a-952f-97f3f76c6ddd}
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Stack
+
+
+ Source Files\Stack
+
+
+ Source Files\Stack
+
+
+ Source Files\Master
+
+
+ Source Files\Master
+
+
+ Source Files\Master
+
+
+ Source Files\Master
+
+
+ Source Files\Master
+
+
+ Source Files\Master
+
+
+ Source Files\Master
+
+
+ Source Files\Master\Tasks
+
+
+ Source Files\Master\Tasks
+
+
+ Source Files\Master\Tasks
+
+
+ Source Files\Master\Tasks
+
+
+ Source Files\Master\Tasks
+
+
+ Source Files\Transport
+
+
+ Source Files\Transport
+
+
+ Source Files\Transport
+
+
+ Source Files\Transport
+
+
+ Source Files\Transport
+
+
+ Source Files\Transport
+
+
+ Source Files\User
+
+
+ Source Files\User
+
+
+ Source Files\User
+
+
+ Source Files\User
+
+
+ Source Files\User
+
+
+ Source Files\User
+
+
+ Source Files\User\VTO
+
+
+ Source Files\User\VTO
+
+
+ Source Files\User\VTO
+
+
+ Source Files\User\VTO
+
+
+ Source Files\User\VTO
+
+
+ Source Files\User\VTO
+
+
+ Source Files\User\VTO
+
+
+ Source Files\User\VTO
+
+
+ Source Files\User\VTO
+
+
+ Source Files\User\VTO
+
+
+ Source Files\User\VTO
+
+
+ Source Files\User\VTO
+
+
+ Source Files\User\VTO
+
+
+ Source Files\Application
+
+
+ Source Files\Application
+
+
+ Source Files\Application
+
+
+ Source Files\Application\APDU
+
+
+ Source Files\Application\APDU
+
+
+ Source Files\Application\APDU
+
+
+ Source Files\Application\APDU
+
+
+ Source Files\Application\APDU
+
+
+ Source Files\Application\APDU
+
+
+ Source Files\Application\APDU\Iterators
+
+
+ Source Files\Application\APDU\Iterators
+
+
+ Source Files\Application\APDU\Iterators
+
+
+ Source Files\Application\APDU\Iterators
+
+
+ Source Files\Application\Channels
+
+
+ Source Files\Application\Channels
+
+
+ Source Files\Application\Channels
+
+
+ Source Files\Application\Channels
+
+
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\DataLink
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Slave
+
+
+ Source Files\Stack
+
+
+ Source Files\Stack
+
+
+ Source Files\Stack
+
+
+ Source Files\Master
+
+
+ Source Files\Master
+
+
+ Source Files\Master
+
+
+ Source Files\Master
+
+
+ Source Files\Master\Tasks
+
+
+ Source Files\Master\Tasks
+
+
+ Source Files\Master\Tasks
+
+
+ Source Files\Master\Tasks
+
+
+ Source Files\Master\Tasks
+
+
+ Source Files\Transport
+
+
+ Source Files\Transport
+
+
+ Source Files\Transport
+
+
+ Source Files\Transport
+
+
+ Source Files\Transport
+
+
+ Source Files\User
+
+
+ Source Files\User
+
+
+ Source Files\User
+
+
+ Source Files\User
+
+
+ Source Files\User\VTO
+
+
+ Source Files\User\VTO
+
+
+ Source Files\User\VTO
+
+
+ Source Files\User\VTO
+
+
+ Source Files\User\VTO
+
+
+ Source Files\User\VTO
+
+
+ Source Files\User\VTO
+
+
+ Source Files\User\VTO
+
+
+ Source Files\User\VTO
+
+
+ Source Files\Application
+
+
+ Source Files\Application
+
+
+ Source Files\Application\APDU
+
+
+ Source Files\Application\APDU
+
+
+ Source Files\Application\APDU
+
+
+ Source Files\Application\APDU
+
+
+ Source Files\Application\APDU
+
+
+ Source Files\Application\APDU
+
+
+ Source Files\Application\APDU\Iterators
+
+
+ Source Files\Application\APDU\Iterators
+
+
+ Source Files\Application\APDU\Iterators
+
+
+ Source Files\Application\APDU\Iterators
+
+
+ Source Files\Application\Channels
+
+
+ Source Files\Application\Channels
+
+
+ Source Files\Application\Channels
+
+
+ Source Files\Application\Channels
+
+
+
\ No newline at end of file
diff --git a/DNP3Java/DNP3Java.vcxproj b/DNP3Java/DNP3Java.vcxproj
new file mode 100755
index 00000000..78a413d4
--- /dev/null
+++ b/DNP3Java/DNP3Java.vcxproj
@@ -0,0 +1,113 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ {ADDD6B3A-FFAE-4534-B27B-2795CEE8D2AD}
+ DNP3JavaBindings
+ Win32Proj
+
+
+
+ DynamicLibrary
+ Unicode
+ true
+
+
+ DynamicLibrary
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ true
+ false
+
+
+
+ Disabled
+ WIN32;_DEBUG;_WINDOWS;_USRDLL;DNP3JAVABINDINGS_EXPORTS;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ EditAndContinue
+
+
+ $(OutDir)dnp3java.dll
+ true
+ Windows
+ MachineX86
+
+
+
+
+ WIN32;NDEBUG;_WINDOWS;_USRDLL;DNP3JAVABINDINGS_EXPORTS;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+
+ Level3
+ ProgramDatabase
+
+
+ $(OutDir)dnp3java.dll
+ true
+ Windows
+ true
+ true
+ MachineX86
+
+
+
+
+ {761218b0-f2b7-42da-9c9b-413fa34886df}
+ true
+ true
+
+
+ {e053e7ed-f462-4de0-8d69-6d97045ffb25}
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/DNP3Java/DNP3Java.vcxproj.filters b/DNP3Java/DNP3Java.vcxproj.filters
new file mode 100755
index 00000000..0febfd8d
--- /dev/null
+++ b/DNP3Java/DNP3Java.vcxproj.filters
@@ -0,0 +1,19 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+
+
+ Source Files
+
+
+
+
+ Source Files
+
+
+
\ No newline at end of file
diff --git a/DNP3Java/JNI_INCLUDES.props b/DNP3Java/JNI_INCLUDES.props
new file mode 100755
index 00000000..38100aa7
--- /dev/null
+++ b/DNP3Java/JNI_INCLUDES.props
@@ -0,0 +1,11 @@
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ $(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)
+
+
+
\ No newline at end of file
diff --git a/DNP3Test/TestTransportLoopback.cpp b/DNP3Test/TestTransportLoopback.cpp
index 3eed8931..ede0e640 100644
--- a/DNP3Test/TestTransportLoopback.cpp
+++ b/DNP3Test/TestTransportLoopback.cpp
@@ -45,15 +45,15 @@ void TestLoopback(TransportLoopbackTestObject* apTest, size_t aNumBytes)
{
apTest->Start();
- BOOST_REQUIRE(apTest->ProceedUntil(bind(&TransportLoopbackTestObject::LayersUp, apTest)));
+ BOOST_REQUIRE(apTest->ProceedUntil(boost::bind(&TransportLoopbackTestObject::LayersUp, apTest)));
ByteStr b(aNumBytes, 0);
apTest->mUpperA.SendDown(b, b.Size());
apTest->mUpperB.SendDown(b, b.Size());
- BOOST_REQUIRE(apTest->ProceedUntil(bind(&MockUpperLayer::SizeEquals, &(apTest->mUpperA), b.Size())));
- BOOST_REQUIRE(apTest->ProceedUntil(bind(&MockUpperLayer::SizeEquals, &(apTest->mUpperB), b.Size())));
+ BOOST_REQUIRE(apTest->ProceedUntil(boost::bind(&MockUpperLayer::SizeEquals, &(apTest->mUpperA), b.Size())));
+ BOOST_REQUIRE(apTest->ProceedUntil(boost::bind(&MockUpperLayer::SizeEquals, &(apTest->mUpperB), b.Size())));
BOOST_REQUIRE(apTest->mUpperA.BufferEquals(b, b.Size()));
BOOST_REQUIRE(apTest->mUpperB.BufferEquals(b, b.Size()));
}
diff --git a/DNP3Test/TestTransportScalability.cpp b/DNP3Test/TestTransportScalability.cpp
index 858b54b5..fb5d3d7e 100644
--- a/DNP3Test/TestTransportScalability.cpp
+++ b/DNP3Test/TestTransportScalability.cpp
@@ -65,13 +65,13 @@ BOOST_AUTO_TEST_CASE(TestSimpleSend)
t.Start();
- BOOST_REQUIRE(t.ProceedUntil(bind(&TransportScalabilityTestObject::AllLayersUp, &t)));
+ BOOST_REQUIRE(t.ProceedUntil(boost::bind(&TransportScalabilityTestObject::AllLayersUp, &t)));
ByteStr b(2048, 0);
t.SendToAll(b, b.Size());
- BOOST_REQUIRE(t.ProceedUntil(bind(&TransportScalabilityTestObject::AllLayerReceived, &t, b.Size()), 120000));
+ BOOST_REQUIRE(t.ProceedUntil(boost::bind(&TransportScalabilityTestObject::AllLayerReceived, &t, b.Size()), 120000));
BOOST_REQUIRE(t.AllLayerEqual(b, b.Size()));
}
diff --git a/DNP3XML/DNP3XML.vcxproj b/DNP3XML/DNP3XML.vcxproj
new file mode 100755
index 00000000..164e18d9
--- /dev/null
+++ b/DNP3XML/DNP3XML.vcxproj
@@ -0,0 +1,85 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ {547D1F36-8A34-4C48-B16D-9C3D60EFA505}
+ DNP3XML
+ Win32Proj
+
+
+
+ StaticLibrary
+ Unicode
+ true
+
+
+ StaticLibrary
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ Disabled
+ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ EditAndContinue
+
+
+
+
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+
+ Level3
+ ProgramDatabase
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/DNP3XML/DNP3XML.vcxproj.filters b/DNP3XML/DNP3XML.vcxproj.filters
new file mode 100755
index 00000000..202a2a15
--- /dev/null
+++ b/DNP3XML/DNP3XML.vcxproj.filters
@@ -0,0 +1,31 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
\ No newline at end of file
diff --git a/Terminal/PhysicalLayerSyncProxy.cpp b/Terminal/PhysicalLayerSyncProxy.cpp
index ffc70c6d..943207c3 100755
--- a/Terminal/PhysicalLayerSyncProxy.cpp
+++ b/Terminal/PhysicalLayerSyncProxy.cpp
@@ -3,14 +3,14 @@
#include
#include
-using namespace boost::system;
+//using namespace boost::system;
using namespace std;
namespace apl
{
-const boost::system::error_code PhysicalLayerSyncProxy::mSuccessCode(errc::success, get_generic_category());
-const boost::system::error_code PhysicalLayerSyncProxy::mErrorCode(errc::permission_denied, get_generic_category());
+const boost::system::error_code PhysicalLayerSyncProxy::mSuccessCode(boost::system::errc::success, boost::system::get_generic_category());
+const boost::system::error_code PhysicalLayerSyncProxy::mErrorCode(boost::system::errc::permission_denied, boost::system::get_generic_category());
PhysicalLayerSyncProxy::PhysicalLayerSyncProxy(Logger* apLogger, boost::asio::io_service* apService) :
PhysicalLayerAsyncBase(apLogger),
diff --git a/Terminal/Terminal.vcxproj b/Terminal/Terminal.vcxproj
new file mode 100755
index 00000000..19a060a0
--- /dev/null
+++ b/Terminal/Terminal.vcxproj
@@ -0,0 +1,106 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ {FB9D36B0-102F-4E11-BF45-C80A3709D098}
+ Terminal
+ Win32Proj
+
+
+
+ StaticLibrary
+ Unicode
+ true
+
+
+ StaticLibrary
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(Configuration)\
+ $(Configuration)\
+ $(Configuration)\
+ $(Configuration)\
+
+
+
+ Disabled
+ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ EditAndContinue
+
+
+
+
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+
+ Level3
+ ProgramDatabase
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Terminal/Terminal.vcxproj.filters b/Terminal/Terminal.vcxproj.filters
new file mode 100755
index 00000000..92171cc2
--- /dev/null
+++ b/Terminal/Terminal.vcxproj.filters
@@ -0,0 +1,82 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {5f62e6f5-60b6-4f57-9cf2-a5a444c5d6ce}
+
+
+ {435004df-5f79-4c02-bd97-c45e74ec5d0a}
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\Extensions
+
+
+ Source Files\Extensions
+
+
+ Source Files\Extensions
+
+
+ Source Files\Extensions
+
+
+ Source Files\Extensions
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\PhysicalLayer
+
+
+ Source Files\Extensions
+
+
+ Source Files\Extensions
+
+
+ Source Files\Extensions
+
+
+ Source Files\Extensions
+
+
+ Source Files\Extensions
+
+
+
\ No newline at end of file
diff --git a/TerminalTest/TerminalTest.vcxproj b/TerminalTest/TerminalTest.vcxproj
new file mode 100755
index 00000000..df990604
--- /dev/null
+++ b/TerminalTest/TerminalTest.vcxproj
@@ -0,0 +1,118 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ {6AB7896D-E692-4075-9396-9B1C7AE6F704}
+ TerminalTest
+ Win32Proj
+
+
+
+ Application
+ Unicode
+ true
+
+
+ Application
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(Configuration)\
+ $(Configuration)\
+ true
+ $(Configuration)\
+ $(Configuration)\
+ false
+
+
+
+ Disabled
+ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ EditAndContinue
+
+
+ true
+ Console
+ MachineX86
+
+
+
+
+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+
+ Level3
+ ProgramDatabase
+
+
+ true
+ Console
+ true
+ true
+ MachineX86
+
+
+
+
+ {761218b0-f2b7-42da-9c9b-413fa34886df}
+ true
+ true
+
+
+ {41d4b22b-f06e-4230-9aa8-3bff096cc710}
+ true
+ true
+
+
+ {fb9d36b0-102f-4e11-bf45-c80a3709d098}
+ true
+ true
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/TerminalTest/TerminalTest.vcxproj.filters b/TerminalTest/TerminalTest.vcxproj.filters
new file mode 100755
index 00000000..e8e59a61
--- /dev/null
+++ b/TerminalTest/TerminalTest.vcxproj.filters
@@ -0,0 +1,17 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+
\ No newline at end of file
diff --git a/TestAPL/TestAPL.vcxproj b/TestAPL/TestAPL.vcxproj
new file mode 100755
index 00000000..5e8c7f39
--- /dev/null
+++ b/TestAPL/TestAPL.vcxproj
@@ -0,0 +1,170 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ APLTest
+ {9BCA9E3F-3974-4B32-883D-9115160E4051}
+ DNPTest
+ Win32Proj
+
+
+
+ Application
+ MultiByte
+
+
+ Application
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(Configuration)\
+ $(Configuration)\
+ true
+ false
+
+
+
+ Disabled
+ %(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ true
+ Sync
+ Default
+ MultiThreadedDebugDLL
+ false
+ Precise
+
+
+ Level3
+ EditAndContinue
+ 4355;%(DisableSpecificWarnings)
+
+
+ wsock32.lib %(AdditionalOptions)
+ $(OutDir)$(TargetName)$(TargetExt)
+ %(AdditionalLibraryDirectories)
+ true
+ $(OutDir)DNPTest.pdb
+ Console
+ MachineX86
+
+
+
+
+ %(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+
+ Level3
+ ProgramDatabase
+
+
+ true
+ wsock32.lib %(AdditionalOptions)
+ $(OutDir)DNPTest.exe
+ %(AdditionalLibraryDirectories)
+ true
+ Console
+ true
+ true
+ MachineX86
+
+
+
+
+ {761218b0-f2b7-42da-9c9b-413fa34886df}
+ true
+ true
+
+
+ {41d4b22b-f06e-4230-9aa8-3bff096cc710}
+ true
+ true
+
+
+ {220d8eb8-6c0c-416c-8bbb-f554431c29cd}
+ true
+ true
+
+
+ {91323793-8551-4484-83dc-21ac9c18bd2e}
+ true
+ true
+
+
+ {f1eb4fcc-3299-4574-aea2-19b61f35966d}
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/TestAPL/TestAPL.vcxproj.filters b/TestAPL/TestAPL.vcxproj.filters
new file mode 100755
index 00000000..b1458bd3
--- /dev/null
+++ b/TestAPL/TestAPL.vcxproj.filters
@@ -0,0 +1,133 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {5e7b77ac-e3e0-4885-9d10-63c6669f5114}
+
+
+ {26e4fc32-5be0-421f-b2f6-ce2c158423a9}
+
+
+ {ee29dfd6-9119-4844-a450-1dfac644d3e2}
+
+
+ {818c11e0-c895-4705-8237-d4d8ea6b2bb9}
+
+
+ {d16f601a-12ae-4e5c-83ad-75a42cf24abb}
+
+
+ {7452d8eb-972d-4a18-82d4-1102e0ed1727}
+
+
+ {1b128d70-36d8-4182-8b67-acb1734ae7ed}
+
+
+ {4aedbf7a-de6e-460f-a502-90d6bd724f58}
+
+
+ {d340aab4-fcc2-43ed-8a5d-fe523ab8997c}
+
+
+ {d9309431-feda-4469-aea6-960b91558fff}
+
+
+ {279b91f8-f0fe-4d4b-b02f-a241d8504487}
+
+
+ {2fd7a966-d048-4092-b069-c8ded80c683a}
+
+
+
+
+ Source Files\TestPhysicalLayer
+
+
+ Source Files\TestPhysicalLayer
+
+
+ Source Files\TestPhysicalLayer
+
+
+ Source Files\TestPhysicalLayer
+
+
+ Source Files\TestPhysicalLayer
+
+
+ Source Files\TestPhysicalLayer\Framework
+
+
+ Source Files\TestPhysicalLayer\Framework
+
+
+ Source Files\TestTime
+
+
+ Source Files\TestMisc
+
+
+ Source Files\TestMisc
+
+
+ Source Files\TestMisc
+
+
+ Source Files\TestMisc
+
+
+ Source Files\TestMisc
+
+
+ Source Files\TestThreading
+
+
+ Source Files\TestThreading
+
+
+ Source Files\TestThreading
+
+
+ Source Files\TestLog
+
+
+ Source Files\TestMeasFramework
+
+
+ Source Files\TestMeasFramework
+
+
+ Source Files\TestMeasFramework
+
+
+ Source Files\TestXml
+
+
+ Source Files\TestUtil
+
+
+ Source Files\TestProtocol
+
+
+ Source Files\TestProtocol
+
+
+ Source Files\TestTimers
+
+
+ Source Files\TestAsyncTask
+
+
+
+
+ Source Files\TestPhysicalLayer\Framework
+
+
+ Source Files\TestPhysicalLayer\Framework
+
+
+
\ No newline at end of file
diff --git a/TestAPL/TestASIO.cpp b/TestAPL/TestASIO.cpp
index 9093b5ad..fe48b0a0 100644
--- a/TestAPL/TestASIO.cpp
+++ b/TestAPL/TestASIO.cpp
@@ -54,8 +54,8 @@ BOOST_AUTO_TEST_CASE(TimerCancel)
deadline_timer t1(io, posix_time::seconds(0));
deadline_timer t2(io, posix_time::seconds(1000));
- t1.async_wait(bind(Cancel, &t2));
- t2.async_wait(bind(AssertCanceled, &flag, _1));
+ t1.async_wait(boost::bind(Cancel, &t2));
+ t2.async_wait(boost::bind(AssertCanceled, &flag, _1));
io.run();
diff --git a/XMLBindings/XMLBindings.vcxproj b/XMLBindings/XMLBindings.vcxproj
new file mode 100755
index 00000000..d1ee9b61
--- /dev/null
+++ b/XMLBindings/XMLBindings.vcxproj
@@ -0,0 +1,91 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ {F1EB4FCC-3299-4574-AEA2-19B61F35966D}
+ XMLBindings
+ Win32Proj
+
+
+
+ StaticLibrary
+ Unicode
+ true
+
+
+ StaticLibrary
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(Configuration)\
+ $(Configuration)\
+ $(Configuration)\
+ $(Configuration)\
+
+
+
+ Disabled
+ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ EditAndContinue
+
+
+
+
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+
+ Level3
+ ProgramDatabase
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/XMLBindings/XMLBindings.vcxproj.filters b/XMLBindings/XMLBindings.vcxproj.filters
new file mode 100755
index 00000000..aa9e87c8
--- /dev/null
+++ b/XMLBindings/XMLBindings.vcxproj.filters
@@ -0,0 +1,37 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
\ No newline at end of file
diff --git a/config/boost_includes.props b/config/boost_includes.props
new file mode 100755
index 00000000..b8c4f026
--- /dev/null
+++ b/config/boost_includes.props
@@ -0,0 +1,11 @@
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ $(TOOLS_HOME)\boostlib\boost_1_47_0\include;%(AdditionalIncludeDirectories)
+
+
+
\ No newline at end of file
diff --git a/config/boost_lib.props b/config/boost_lib.props
new file mode 100755
index 00000000..8567be19
--- /dev/null
+++ b/config/boost_lib.props
@@ -0,0 +1,11 @@
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ $(TOOLS_HOME)\boostlib\boost_1_47_0\windows;%(AdditionalLibraryDirectories)
+
+
+
\ No newline at end of file
diff --git a/config/common_boost_defines.props b/config/common_boost_defines.props
new file mode 100755
index 00000000..f956cd84
--- /dev/null
+++ b/config/common_boost_defines.props
@@ -0,0 +1,11 @@
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ _WIN32_WINNT=0x0501;BOOST_ASIO_ENABLE_CANCELIO;BOOST_REGEX_NO_LIB;%(PreprocessorDefinitions)
+
+
+
\ No newline at end of file
diff --git a/config/disable_specific_warnings.props b/config/disable_specific_warnings.props
new file mode 100755
index 00000000..1e4fd5c8
--- /dev/null
+++ b/config/disable_specific_warnings.props
@@ -0,0 +1,11 @@
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ /wd4355 %(AdditionalOptions)
+
+
+
\ No newline at end of file
diff --git a/config/local_dir.props b/config/local_dir.props
new file mode 100755
index 00000000..df1d9776
--- /dev/null
+++ b/config/local_dir.props
@@ -0,0 +1,11 @@
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ ../;%(AdditionalIncludeDirectories)
+
+
+
\ No newline at end of file
diff --git a/config/output_dirs.props b/config/output_dirs.props
new file mode 100755
index 00000000..d515385c
--- /dev/null
+++ b/config/output_dirs.props
@@ -0,0 +1,8 @@
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(Configuration)\
+ $(Configuration)\
+
+
\ No newline at end of file
diff --git a/tinyxml/tinyxml.vcxproj b/tinyxml/tinyxml.vcxproj
new file mode 100755
index 00000000..657c9308
--- /dev/null
+++ b/tinyxml/tinyxml.vcxproj
@@ -0,0 +1,85 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ {220D8EB8-6C0C-416C-8BBB-F554431C29CD}
+ tinyxml
+ Win32Proj
+
+
+
+ StaticLibrary
+ Unicode
+ true
+
+
+ StaticLibrary
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(Configuration)\
+ $(Configuration)\
+ $(Configuration)\
+ $(Configuration)\
+
+
+
+ Disabled
+ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ EditAndContinue
+
+
+
+
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+
+ Level3
+ ProgramDatabase
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tinyxml/tinyxml.vcxproj.filters b/tinyxml/tinyxml.vcxproj.filters
new file mode 100755
index 00000000..bf11432c
--- /dev/null
+++ b/tinyxml/tinyxml.vcxproj.filters
@@ -0,0 +1,31 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+
\ No newline at end of file
diff --git a/tools/install_scripts/boost/1_47_0/install-boost.bat b/tools/install_scripts/boost/1_47_0/install-boost.bat
index e0e5d6c5..62470239 100755
--- a/tools/install_scripts/boost/1_47_0/install-boost.bat
+++ b/tools/install_scripts/boost/1_47_0/install-boost.bat
@@ -1,4 +1,4 @@
-call "C:\Program Files\Microsoft Visual Studio 8\VC\vcvarsall.bat"
+#call "C:\Program Files\Microsoft Visual Studio 8\VC\vcvarsall.bat"
cd temp\boost_1_47_0
call ./bootstrap.bat