Changeset 963c3b for src/Fragmentation

Timestamp:

May 4, 2012, 2:15:41 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

31ca5f

Parents:

a636f8

git-author:

Frederik Heber <heber@…> (11/18/11 20:29:36)

git-committer:

Frederik Heber <heber@…> (05/04/12 14:15:41)

Message:

Took connection out of namespace.

Location:

src/Fragmentation/Automation

Files:

• StockClient.cpp (modified) (1 diff)
• StockClient.hpp (modified) (3 diffs)
• StockServer.cpp (modified) (2 diffs)
• StockServer.hpp (modified) (1 diff)
• connection.hpp (modified) (2 diffs)

src/Fragmentation/Automation/StockClient.cpp

@@ -14 +14 @@
 #include "stock.hpp"
 #include "StockClient.hpp"
-
-using namespace s11n_example;
 
 /// Constructor starts the asynchronous connect operation.

src/Fragmentation/Automation/StockClient.hpp

@@ -10 +10 @@
 
 #include <boost/asio.hpp>
-#include <iostream>
+#include <vector>
 #include "connection.hpp" // Must come before boost/serialization headers.
 #include "stock.hpp"
@@ -21 +21 @@
   StockClient(boost::asio::io_service& io_service,
       const std::string& host, const std::string& service);
+
   /// Handle completion of a connect operation.
   void handle_connect(const boost::system::error_code& e);
@@ -29 +30 @@
 private:
   /// The connection to the server.
-  s11n_example::connection connection_;
+  connection connection_;
 
   /// The data received from the server.

src/Fragmentation/Automation/StockServer.cpp

@@ -16 +16 @@
 
 #include "StockServer.hpp"
-
-using namespace s11n_example;
 
 StockServer::StockServer(boost::asio::io_service& io_service, unsigned short port) :
@@ -67 +65 @@
       boost::bind(&StockServer::handle_write, this,
       boost::asio::placeholders::error, conn));
-}
+  }
 
   connection_ptr new_conn(new connection(acceptor_.get_io_service()));

src/Fragmentation/Automation/StockServer.hpp

@@ -23 +23 @@
 
   /// Handle completion of a accept operation.
-  void handle_accept(const boost::system::error_code& e, s11n_example::connection_ptr conn);
+  void handle_accept(const boost::system::error_code& e, connection_ptr conn);
 
   /// Handle completion of a write operation.
-  void handle_write(const boost::system::error_code& e, s11n_example::connection_ptr conn);
+  void handle_write(const boost::system::error_code& e, connection_ptr conn);
 
 private:

src/Fragmentation/Automation/connection.hpp

@@ -22 +22 @@
 #include <sstream>
 #include <vector>
-
-namespace s11n_example {
 
 /// The connection class provides serialization primitives on top of a socket.
@@ -184 +182 @@
 typedef boost::shared_ptr<connection> connection_ptr;
 
-} // namespace s11n_example
-
 #endif // SERIALIZATION_CONNECTION_HPP