[Liblas-commits] hg-main-tree: offbyone error

[liblas-commits at liblas.org]

details:   http://hg.libpc.orghg-main-tree/rev/2a3ebfdb9732
changeset: 302:2a3ebfdb9732
user:      Michael P. Gerlek <mpg at flaxen.com>
date:      Wed Mar 16 16:19:10 2011 -0400
description:
offbyone error
Subject: hg-main-tree: added libpc.hpp

details:   http://hg.libpc.orghg-main-tree/rev/9691cd50aeac
changeset: 303:9691cd50aeac
user:      Michael P. Gerlek <mpg at flaxen.com>
date:      Wed Mar 16 16:19:23 2011 -0400
description:
added libpc.hpp
Subject: hg-main-tree: merge

details:   http://hg.libpc.orghg-main-tree/rev/f6f43b72f699
changeset: 304:f6f43b72f699
user:      Michael P. Gerlek <mpg at flaxen.com>
date:      Wed Mar 16 16:19:33 2011 -0400
description:
merge

diffstat:

 include/libpc/libpc.hpp  |  37 +++++++++++++++++++++++++++++++++++++
 src/CMakeLists.txt       |   1 +
 test/unit/ConfigTest.cpp |   3 +--
 test/unit/main.cpp       |   9 +++++++--
 4 files changed, 46 insertions(+), 4 deletions(-)

diffs (98 lines):

diff -r 9ee4dd85b70d -r f6f43b72f699 include/libpc/libpc.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/include/libpc/libpc.hpp	Wed Mar 16 16:19:33 2011 -0400
@@ -0,0 +1,37 @@
+/******************************************************************************
+* Copyright (c) 2011, Michael P. Gerlek (mpg at flaxen.com)
+*
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following
+* conditions are met:
+*
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in
+*       the documentation and/or other materials provided
+*       with the distribution.
+*     * Neither the name of Hobu, Inc. or Flaxen Geo Consulting nor the
+*       names of its contributors may be used to endorse or promote
+*       products derived from this software without specific prior
+*       written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+* OF SUCH DAMAGE.
+****************************************************************************/
+
+#include <libpc/export.hpp>
+#include <libpc/libpc_defines.h>
+#include <libpc/libpc_config.hpp>
diff -r 9ee4dd85b70d -r f6f43b72f699 src/CMakeLists.txt
--- a/src/CMakeLists.txt	Wed Mar 16 15:38:38 2011 -0400
+++ b/src/CMakeLists.txt	Wed Mar 16 16:19:33 2011 -0400
@@ -34,6 +34,7 @@
 set(LIBPC_BASE_HPP
   ${LIBPC_HEADERS_DIR}/exceptions.hpp
   ${LIBPC_HEADERS_DIR}/export.hpp
+  ${LIBPC_HEADERS_DIR}/libpc.hpp
   ${LIBPC_HEADERS_DIR}/libpc_config.hpp
   ${LIBPC_HEADERS_DIR}/Bounds.hpp
   ${LIBPC_HEADERS_DIR}/Color.hpp
diff -r 9ee4dd85b70d -r f6f43b72f699 test/unit/ConfigTest.cpp
--- a/test/unit/ConfigTest.cpp	Wed Mar 16 15:38:38 2011 -0400
+++ b/test/unit/ConfigTest.cpp	Wed Mar 16 16:19:33 2011 -0400
@@ -35,8 +35,7 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/cstdint.hpp>
 
-#include <libpc/libpc_defines.h>
-#include <libpc/libpc_config.hpp>
+#include <libpc/libpc.hpp>
 
 using namespace libpc;
 
diff -r 9ee4dd85b70d -r f6f43b72f699 test/unit/main.cpp
--- a/test/unit/main.cpp	Wed Mar 16 15:38:38 2011 -0400
+++ b/test/unit/main.cpp	Wed Mar 16 16:19:33 2011 -0400
@@ -33,6 +33,11 @@
 ****************************************************************************/
 
 #include <string>
+
+#ifndef BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE Main
+#endif
+
 #include <boost/test/unit_test.hpp>
 #include <boost/test/utils/assign_op.hpp>
 
@@ -72,7 +77,7 @@
         g_data_path = argv[1];
     else
         g_data_path = "../test/data";
-    if (g_data_path[g_data_path.size()] != '/')
+    if (g_data_path[g_data_path.size()-1] != '/')
         g_data_path += "/";
     
 #ifdef BOOST_TEST_ALTERNATIVE_INIT_API
@@ -82,7 +87,7 @@
 #endif
 }
 
-#if defined(BOOST_TEST_DYN_LINK)
+#if defined(BOOST_TEST_DYN_LINK) 
 
 int
 main( int argc, char* argv[] )