Changeset 3262 for code/branches/core4/src/core
- Timestamp:
- Jul 1, 2009, 10:04:54 AM (15 years ago)
- Location:
- code/branches/core4/src/core
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core4/src/core/CommandLine.cc
r3257 r3262 29 29 #include "CommandLine.h" 30 30 31 #include <algorithm> 31 32 #include <sstream> 32 33 #include <boost/filesystem.hpp> -
code/branches/core4/src/core/Executor.cc
r3196 r3262 99 99 100 100 // assign all given arguments to the multitypes 101 for (unsigned int i = 0; i < min(tokens.size(), (unsigned int)MAX_FUNCTOR_ARGUMENTS); i++)101 for (unsigned int i = 0; i < std::min(tokens.size(), (unsigned int)MAX_FUNCTOR_ARGUMENTS); i++) 102 102 param[i] = tokens[i]; 103 103 104 104 // fill the remaining multitypes with default values 105 for (unsigned int i = tokens.size(); i < min(paramCount, (unsigned int)MAX_FUNCTOR_ARGUMENTS); i++)105 for (unsigned int i = tokens.size(); i < std::min(paramCount, (unsigned int)MAX_FUNCTOR_ARGUMENTS); i++) 106 106 param[i] = this->defaultValue_[i]; 107 107 108 108 // evaluate the param types through the functor 109 for (unsigned int i = 0; i < min(paramCount, (unsigned int)MAX_FUNCTOR_ARGUMENTS); i++)109 for (unsigned int i = 0; i < std::min(paramCount, (unsigned int)MAX_FUNCTOR_ARGUMENTS); i++) 110 110 this->functor_->evaluateParam(i, param[i]); 111 111 -
code/branches/core4/src/core/Executor.h
r3257 r3262 32 32 33 33 #include "CorePrereqs.h" 34 35 #include <algorithm> 36 #include <string> 34 37 35 38 #include "util/Debug.h" … … 101 104 COUT(5) << tokens[i]; \ 102 105 } \ 103 COUT(5) << ") and " << max((int)paramCount - (int)tokens.size(), 0) << " default values ("; \106 COUT(5) << ") and " << std::max((int)paramCount - (int)tokens.size(), 0) << " default values ("; \ 104 107 for (unsigned int i = tokens.size(); i < paramCount; i++) \ 105 108 { \
Note: See TracChangeset
for help on using the changeset viewer.