[Boost-commit] svn:boost r42727 - sandbox/libs/sequence_algo/example

From: philgarofalo_at_[hidden]
Date: 2008-01-13 12:29:30

Author: pgarofalo
Date: 2008-01-13 12:29:30 EST (Sun, 13 Jan 2008)
New Revision: 42727
URL: http://svn.boost.org/trac/boost/changeset/42727

Log:
Removed an archaic compiler accommodation; added error message output if the dictionary can't open.
Text files modified: 
   sandbox/libs/sequence_algo/example/combinatorial_ex2.cpp |    16 +++-------------                        
   1 files changed, 3 insertions(+), 13 deletions(-)

Modified: sandbox/libs/sequence_algo/example/combinatorial_ex2.cpp
==============================================================================
--- sandbox/libs/sequence_algo/example/combinatorial_ex2.cpp	(original)
+++ sandbox/libs/sequence_algo/example/combinatorial_ex2.cpp	2008-01-13 12:29:30 EST (Sun, 13 Jan 2008)
@@ -59,14 +59,8 @@
     "spa",
     "tic"
 };
-#if !defined _MSC_VER
-std::vector<string> theSegs(tri, &tri[12]);
-#else
-// I couldn't assuage MSC about the pointer parameters in the above
-// definition so, I'll define it with the default constructor here
-// and initialize it in main().
-std::vector<std::string> theSegs;
-#endif
+
+std::vector<std::string> theSegs(tri, &tri[12]);
 
 const int R = 4;    // select 4 three-letter words at a time
 
@@ -108,6 +102,7 @@
     {
         std::ostringstream os;
         os << "Couldn't open " << filename << std::ends;
+        std::cerr << os.str() << std::endl;
         throw os.str();
     }
 
@@ -196,11 +191,6 @@
     mat new per sop spa tic\n\
 \
   --Misty Covington, Sparks, MD.\n\n";
-
-#if defined _MSC_VER
-    // See comment above on the definition of theSegs vector.
-    std::copy(&tri[0], &tri[DIM(tri)], back_inserter(theSegs));
-#endif
     
     // First method; search the dictionary for every permutation. Stop after
     // the third word is found.