Skip to content

Commit

Permalink
renamed: Util/StringUtil.h -> Util/string_util.hpp
Browse files Browse the repository at this point in the history
  • Loading branch information
DennisOSRM committed Jan 5, 2015
1 parent d3f5db5 commit fe1f11b
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Server/DataStructures/BaseDataFacade.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../../data_structures/turn_instructions.hpp"
#include "../../Util/integer_range.hpp"
#include "../../Util/OSRMException.h"
#include "../../Util/StringUtil.h"
#include "../../Util/string_util.hpp"
#include "../../typedefs.h"

#include <osrm/Coordinate.h>
Expand Down
2 changes: 1 addition & 1 deletion Server/RequestHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../Library/OSRM.h"
#include "../Util/json_renderer.hpp"
#include "../Util/simple_logger.hpp"
#include "../Util/StringUtil.h"
#include "../Util/string_util.hpp"
#include "../typedefs.h"

#include <osrm/Reply.h>
Expand Down
8 changes: 4 additions & 4 deletions Util/StringUtil.h → Util/string_util.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#ifndef STRINGUTIL_H
#define STRINGUTIL_H
#ifndef STRING_UTIL_HPP
#define STRING_UTIL_HPP

#include <boost/algorithm/string.hpp>

Expand Down Expand Up @@ -154,12 +154,12 @@ inline std::string GetRandomString()
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz";

for (int i = 0; i < 127; ++i)
for (std::size_t i = 0; i < 127; ++i)
{
s[i] = alphanum[rand() % (sizeof(alphanum) - 1)];
}
s[127] = 0;
return s;
}

#endif // STRINGUTIL_H
#endif // STRING_UTIL_HPP
2 changes: 1 addition & 1 deletion algorithms/object_encoder.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef OBJECT_ENCODER_HPP
#define OBJECT_ENCODER_HPP

#include "../Util/StringUtil.h"
#include "../Util/string_util.hpp"

#include <boost/assert.hpp>
#include <boost/archive/iterators/base64_from_binary.hpp>
Expand Down
1 change: 0 additions & 1 deletion contractor/contractor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../data_structures/xor_fast_hash_storage.hpp"
#include "../Util/integer_range.hpp"
#include "../Util/simple_logger.hpp"
#include "../Util/StringUtil.h"
#include "../Util/timing_util.hpp"
#include "../typedefs.h"

Expand Down
2 changes: 1 addition & 1 deletion contractor/processing_chain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../Util/make_unique.hpp"
#include "../Util/OSRMException.h"
#include "../Util/simple_logger.hpp"
#include "../Util/StringUtil.h"
#include "../Util/string_util.hpp"
#include "../Util/timing_util.hpp"
#include "../typedefs.h"

Expand Down
2 changes: 1 addition & 1 deletion data_structures/Coordinate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef NDEBUG
#include "../Util/simple_logger.hpp"
#endif
#include "../Util/StringUtil.h"
#include "../Util/string_util.hpp"

#include <boost/assert.hpp>

Expand Down
2 changes: 1 addition & 1 deletion descriptors/json_descriptor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../Util/integer_range.hpp"
#include "../Util/json_renderer.hpp"
#include "../Util/simple_logger.hpp"
#include "../Util/StringUtil.h"
#include "../Util/string_util.hpp"
#include "../Util/timing_util.hpp"

#include <algorithm>
Expand Down
2 changes: 1 addition & 1 deletion plugins/distance_table.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../descriptors/descriptor_base.hpp"
#include "../Util/json_renderer.hpp"
#include "../Util/make_unique.hpp"
#include "../Util/StringUtil.h"
#include "../Util/string_util.hpp"
#include "../Util/timing_util.hpp"

#include <cstdlib>
Expand Down
2 changes: 1 addition & 1 deletion plugins/locate.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#include "../data_structures/json_container.hpp"
#include "../Util/json_renderer.hpp"
#include "../Util/StringUtil.h"
#include "../Util/string_util.hpp"

#include <string>

Expand Down

0 comments on commit fe1f11b

Please sign in to comment.